diff options
| author | Lengyel Balázs <ikervagyok@gmail.com> | 2017-02-05 13:37:16 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-05 13:37:16 +0100 |
| commit | 372cb3760e7e3f7dc544e83b252628f5fe1cef03 (patch) | |
| tree | 56db8dc9ce6c407b5d4b3e188034b440e1af5843 /pkgs/development/libraries/gnutls | |
| parent | 150cddca6f3ee29b46d999e74a2be11b630b3975 (diff) | |
| download | nixpkgs-372cb3760e7e3f7dc544e83b252628f5fe1cef03.tar nixpkgs-372cb3760e7e3f7dc544e83b252628f5fe1cef03.tar.gz nixpkgs-372cb3760e7e3f7dc544e83b252628f5fe1cef03.tar.bz2 nixpkgs-372cb3760e7e3f7dc544e83b252628f5fe1cef03.tar.lz nixpkgs-372cb3760e7e3f7dc544e83b252628f5fe1cef03.tar.xz nixpkgs-372cb3760e7e3f7dc544e83b252628f5fe1cef03.tar.zst nixpkgs-372cb3760e7e3f7dc544e83b252628f5fe1cef03.zip | |
Merge #17694: curl: add gnutlsSupport ? false
(incl. a nitpick change from vcunat)
Diffstat (limited to 'pkgs/development/libraries/gnutls')
| -rw-r--r-- | pkgs/development/libraries/gnutls/generic.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 67a969b1178..74737eb2389 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen ] + buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen ] ++ lib.optional doCheck nettools ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv ++ lib.optional (tpmSupport && stdenv.isLinux) trousers @@ -47,6 +47,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs; + propagatedBuildInputs = [ nettle ]; + inherit doCheck; # Fixup broken libtool and pkgconfig files |