diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-30 11:06:34 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-30 11:06:34 +0200 |
| commit | 17faf910b76841e7ad4b31036be86a0e309c274e (patch) | |
| tree | c14d2a11abbe4b45508e0ffb5a68e755ac71b5ed /pkgs/development/libraries/gnutls | |
| parent | 86e2b0e52b75a80be2c515612cdd50199043e516 (diff) | |
| download | nixpkgs-17faf910b76841e7ad4b31036be86a0e309c274e.tar nixpkgs-17faf910b76841e7ad4b31036be86a0e309c274e.tar.gz nixpkgs-17faf910b76841e7ad4b31036be86a0e309c274e.tar.bz2 nixpkgs-17faf910b76841e7ad4b31036be86a0e309c274e.tar.lz nixpkgs-17faf910b76841e7ad4b31036be86a0e309c274e.tar.xz nixpkgs-17faf910b76841e7ad4b31036be86a0e309c274e.tar.zst nixpkgs-17faf910b76841e7ad4b31036be86a0e309c274e.zip | |
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
Diffstat (limited to 'pkgs/development/libraries/gnutls')
| -rw-r--r-- | pkgs/development/libraries/gnutls/generic.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 3af07f4c6f9..709da27e797 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -11,11 +11,17 @@ assert guileBindings -> guile != null; stdenv.mkDerivation { name = "gnutls-${version}"; - inherit src patches postPatch; + inherit src patches; outputs = [ "dev" "out" "bin" "man" "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 = 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. 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 (tpmSupport && stdenv.isLinux) trousers ++ [ unbound ] @@ -37,10 +43,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs; - patchPhase = '' - patchShebangs . - ''; - # XXX: Gnulib's `test-select' fails on FreeBSD: # http://hydra.nixos.org/build/2962084/nixlog/1/raw . doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); |