From 5148c6c5c0978f6fea6b00df6efa33fb44ce561e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 9 Jul 2016 11:32:00 +0200 Subject: [PATCH] gnutls: fix on Darwin nettools is only used during checkPhase, and we don't do that on Darwin anyway. Close #16783; we don't change hashes on Linux contrary to the PR. --- pkgs/development/libraries/gnutls/generic.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 709da27e7978..72337475ddff 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -4,11 +4,11 @@ # Version dependent args , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? [] -, ...}: +, ...}@args: assert guileBindings -> guile != null; -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "gnutls-${version}"; inherit src patches; @@ -19,7 +19,7 @@ stdenv.mkDerivation { postPatch = '' sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' \ -i tests/cert-tests/name-constraints - '' + postPatch; + '' + args.postPatch; preConfigure = "patchShebangs ."; configureFlags = @@ -35,13 +35,14 @@ stdenv.mkDerivation { # for the actual fix. enableParallelBuilding = !guileBindings; - buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen nettools ] + buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen ] + ++ lib.optional doCheck nettools ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ [ unbound ] ++ lib.optional guileBindings guile; - nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs; + nativeBuildInputs = [ perl pkgconfig ] ++ args.nativeBuildInputs; # XXX: Gnulib's `test-select' fails on FreeBSD: # http://hydra.nixos.org/build/2962084/nixlog/1/raw .