diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-07-30 12:29:18 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-07-30 12:30:23 +0200 |
commit | 46134cbca57baf473dd169b0814c676f0bf27f75 (patch) | |
tree | 57ad94502e37be70e6ad3cf3bc3b8d4da3f65c4b | |
parent | 5915716f134ecc3316983c59d48aea92d92f5c07 (diff) | |
download | nixpkgs-46134cbca57baf473dd169b0814c676f0bf27f75.tar nixpkgs-46134cbca57baf473dd169b0814c676f0bf27f75.tar.gz nixpkgs-46134cbca57baf473dd169b0814c676f0bf27f75.tar.bz2 nixpkgs-46134cbca57baf473dd169b0814c676f0bf27f75.tar.lz nixpkgs-46134cbca57baf473dd169b0814c676f0bf27f75.tar.xz nixpkgs-46134cbca57baf473dd169b0814c676f0bf27f75.tar.zst nixpkgs-46134cbca57baf473dd169b0814c676f0bf27f75.zip |
gnutls-3.3: make it build again
At least without tests. We only have two packages using it ATM.
-rw-r--r-- | pkgs/development/libraries/gnutls/generic.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 10047888423..8d3ef3f4c77 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -10,7 +10,7 @@ assert guileBindings -> guile != null; let # XXX: Gnulib's `test-select' fails on FreeBSD: # http://hydra.nixos.org/build/2962084/nixlog/1/raw . - doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); + doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4"; in stdenv.mkDerivation { name = "gnutls-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { outputs = [ "dev" "out" "bin" "man" "docdev" ]; outputInfo = "docdev"; - postPatch = '' + postPatch = lib.optionalString (lib.versionAtLeast version "3.4") '' sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' \ -i tests/cert-tests/name-constraints '' + postPatch; |