diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-20 23:17:10 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-20 23:21:28 +0100 |
| commit | b17eb34203b891cd801d5d9394d2b3cfa15c786f (patch) | |
| tree | 21a859f073e7f88bb3edbcd72467e70f8c6ea001 /pkgs/development/libraries/gnutls | |
| parent | 3ba1875743c21d5fe184123a88015fdf916a22ee (diff) | |
| download | nixpkgs-b17eb34203b891cd801d5d9394d2b3cfa15c786f.tar nixpkgs-b17eb34203b891cd801d5d9394d2b3cfa15c786f.tar.gz nixpkgs-b17eb34203b891cd801d5d9394d2b3cfa15c786f.tar.bz2 nixpkgs-b17eb34203b891cd801d5d9394d2b3cfa15c786f.tar.lz nixpkgs-b17eb34203b891cd801d5d9394d2b3cfa15c786f.tar.xz nixpkgs-b17eb34203b891cd801d5d9394d2b3cfa15c786f.tar.zst nixpkgs-b17eb34203b891cd801d5d9394d2b3cfa15c786f.zip | |
gnutls: don't propagate -lunistring
This fixes systemd build. Also put it into the generic expression, as there's only one version in nixpkgs ATM.
Diffstat (limited to 'pkgs/development/libraries/gnutls')
| -rw-r--r-- | pkgs/development/libraries/gnutls/3.5.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/gnutls/generic.nix | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix index a5076b9d498..8bb1a2d97f7 100644 --- a/pkgs/development/libraries/gnutls/3.5.nix +++ b/pkgs/development/libraries/gnutls/3.5.nix @@ -7,6 +7,4 @@ callPackage ./generic.nix (args // rec { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz"; sha256 = "0l9971841jsfdcvcyhas17sk5rsby6x5vvwcmmj4x3zi9q60zcc2"; }; - - buildInputs = [ libunistring ]; }) diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 74737eb2389..42bc5d3da66 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -1,6 +1,6 @@ { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip , guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound, libiconv -, tpmSupport ? false, trousers, nettools, bash +, tpmSupport ? false, trousers, nettools, libunistring # Version dependent args , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? [] @@ -37,7 +37,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen ] + buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring ] ++ lib.optional doCheck nettools ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv ++ lib.optional (tpmSupport && stdenv.isLinux) trousers @@ -58,6 +58,9 @@ stdenv.mkDerivation { -e 's,-L${gmp.dev}/lib,-L${gmp.out}/lib,' \ -e 's,-lgmp,-L${gmp.out}/lib -lgmp,' \ -i $out/lib/*.la "$dev/lib/pkgconfig/gnutls.pc" + # It seems only useful for static linking but basically noone does that. + substituteInPlace "$out/lib/libgnutls.la" \ + --replace "-lunistring" "" ''; meta = with lib; { |