Merge #17694: curl: add gnutlsSupport ? false

(incl. a nitpick change from vcunat)
2017-02-05 13:37:16 +01:00
parent 150cddca6f
commit 372cb3760e
2 changed files with 13 additions and 1 deletions
@@ -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