diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-07-09 15:15:42 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-07-09 15:15:42 +0200 |
| commit | 7d94f57309a44d10e1009544734ce80a06a5a827 (patch) | |
| tree | 1d70d77ca4c4fcb604e28424ea514721259cc8e1 /pkgs/development | |
| parent | 340a5d6fbf15deed0cd219f9f835707205a531a3 (diff) | |
| download | nixlib-7d94f57309a44d10e1009544734ce80a06a5a827.tar nixlib-7d94f57309a44d10e1009544734ce80a06a5a827.tar.gz nixlib-7d94f57309a44d10e1009544734ce80a06a5a827.tar.bz2 nixlib-7d94f57309a44d10e1009544734ce80a06a5a827.tar.lz nixlib-7d94f57309a44d10e1009544734ce80a06a5a827.tar.xz nixlib-7d94f57309a44d10e1009544734ce80a06a5a827.tar.zst nixlib-7d94f57309a44d10e1009544734ce80a06a5a827.zip | |
gnutls: fixup evaluation after 5148c6c5c09
Noticed on: https://github.com/NixOS/nixpkgs/commit/5148c6c5c0#commitcomment-18184261
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/gnutls/generic.nix | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 72337475ddff..7cd8267192bc 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -4,11 +4,15 @@ # Version dependent args , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? [] -, ...}@args: +, ...}: assert guileBindings -> guile != null; - -stdenv.mkDerivation rec { +let + # XXX: Gnulib's `test-select' fails on FreeBSD: + # http://hydra.nixos.org/build/2962084/nixlog/1/raw . + doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); +in +stdenv.mkDerivation { name = "gnutls-${version}"; inherit src patches; @@ -19,7 +23,7 @@ stdenv.mkDerivation rec { postPatch = '' sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' \ -i tests/cert-tests/name-constraints - '' + args.postPatch; + '' + postPatch; preConfigure = "patchShebangs ."; configureFlags = @@ -35,18 +39,15 @@ stdenv.mkDerivation rec { # for the actual fix. enableParallelBuilding = !guileBindings; - buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen ] - ++ lib.optional doCheck nettools + buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen nettools ] ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ [ unbound ] ++ lib.optional guileBindings guile; - nativeBuildInputs = [ perl pkgconfig ] ++ args.nativeBuildInputs; + nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs; - # XXX: Gnulib's `test-select' fails on FreeBSD: - # http://hydra.nixos.org/build/2962084/nixlog/1/raw . - doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); + inherit doCheck; # Fixup broken libtool and pkgconfig files preFixup = lib.optionalString (!stdenv.isDarwin) '' |