From 372cb3760e7e3f7dc544e83b252628f5fe1cef03 Mon Sep 17 00:00:00 2001 From: Lengyel Balázs Date: Sun, 5 Feb 2017 13:37:16 +0100 Subject: Merge #17694: curl: add gnutlsSupport ? false (incl. a nitpick change from vcunat) --- pkgs/development/libraries/gnutls/generic.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries/gnutls') 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 -- cgit 1.4.1