gnutls: fixup various problems

- disable a test that started failing due to date expiration, see #16610
- bash doesn't need adding
- defining patchPhase was overriding passed postPatch and patches
This commit is contained in:
Vladimír Čunát 2016-06-30 11:06:34 +02:00
parent 86e2b0e52b
commit 17faf910b7

View File

@ -11,11 +11,17 @@ assert guileBindings -> guile != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gnutls-${version}"; name = "gnutls-${version}";
inherit src patches postPatch; inherit src patches;
outputs = [ "dev" "out" "bin" "man" "docdev" ]; outputs = [ "dev" "out" "bin" "man" "docdev" ];
outputInfo = "docdev"; outputInfo = "docdev";
postPatch = ''
sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' \
-i tests/cert-tests/name-constraints
'' + postPatch;
preConfigure = "patchShebangs .";
configureFlags = configureFlags =
lib.optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt" lib.optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt"
++ [ ++ [
@ -29,7 +35,7 @@ stdenv.mkDerivation {
# for the actual fix. # for the actual fix.
enableParallelBuilding = !guileBindings; enableParallelBuilding = !guileBindings;
buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen nettools bash ] buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen nettools ]
++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
++ [ unbound ] ++ [ unbound ]
@ -37,10 +43,6 @@ stdenv.mkDerivation {
nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs; nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs;
patchPhase = ''
patchShebangs .
'';
# 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);