public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnutls-3.3: make it build again

Browse Source 
At least without tests. We only have two packages using it ATM.
This commit is contained in:
Vladimír Čunát 2016-07-30 12:29:18 +02:00
parent 5915716f13
commit 46134cbca5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/gnutls/generic.nix
View File

@ -10,7 +10,7 @@ assert guileBindings -> guile != null;
let let
# XXX: Gnulib's `test-select' fails on FreeBSD: # XXX: Gnulib's `test-select' fails on FreeBSD:
# http://hydra.nixos.org/build/2962084/nixlog/1/raw . # 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 in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gnutls-${version}"; name = "gnutls-${version}";
@ -20,7 +20,7 @@ stdenv.mkDerivation {
outputs = [ "dev" "out" "bin" "man" "docdev" ]; outputs = [ "dev" "out" "bin" "man" "docdev" ];
outputInfo = "docdev"; outputInfo = "docdev";
postPatch = '' postPatch = lib.optionalString (lib.versionAtLeast version "3.4") ''
sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' \ sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' \
-i tests/cert-tests/name-constraints -i tests/cert-tests/name-constraints
'' + postPatch; '' + postPatch;