From 46134cbca57baf473dd169b0814c676f0bf27f75 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 30 Jul 2016 12:29:18 +0200 Subject: gnutls-3.3: make it build again At least without tests. We only have two packages using it ATM. --- pkgs/development/libraries/gnutls/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/gnutls') diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 100478884239..8d3ef3f4c777 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; -- cgit 1.4.1