From 0243ca52bc36e1a81b2250d65e20770d28d5e792 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 29 Apr 2017 12:38:59 +0200 Subject: [PATCH] libexosip: add patch for openssl 1.1 --- pkgs/development/libraries/exosip/default.nix | 17 ++++++++++++----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index 240f3c136ef5..332504e46b54 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -1,20 +1,27 @@ -{stdenv, fetchurl, libosip, openssl, pkgconfig }: +{ stdenv, fetchurl, libosip, openssl, pkgconfig, fetchpatch }: stdenv.mkDerivation rec { name = "libexosip2-${version}"; version = "4.1.0"; - + src = fetchurl { url = "mirror://savannah/exosip/libeXosip2-${version}.tar.gz"; sha256 = "17cna8kpc8nk1si419vgr6r42k2lda0rdk50vlxrw8rzg0xp2xrw"; }; - + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libosip openssl ]; - + + patches = [ + (fetchpatch { + url = "https://sources.debian.net/data/main/libe/libexosip2/4.1.0-2.1/debian/patches/openssl110.patch"; + sha256 = "01q2dax7pwh197mn18r22y38mrsky85mvs9vbkn9fpcilrdayal6"; + }) + ]; + meta = with stdenv.lib; { license = licenses.gpl2Plus; description = "Library that hides the complexity of using the SIP protocol"; - platforms =platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c364c58b8f56..6f9bee1f41be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11705,9 +11705,7 @@ in libexif = callPackage ../development/libraries/libexif { }; - libexosip = callPackage ../development/libraries/exosip { - openssl = openssl_1_0_2; - }; + libexosip = callPackage ../development/libraries/exosip {}; libextractor = callPackage ../development/libraries/libextractor { libmpeg2 = mpeg2dec;