diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-01-28 18:03:04 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-01-28 18:03:04 +0100 |
| commit | e5523cd7f69b3763bc920ea98711931776fc91f2 (patch) | |
| tree | c72b54a7398aa0e6197d27d6b0e37f1b6495ec58 /pkgs | |
| parent | ac3b8fe91a1e3749fd7d7bf5dd6f3ce1eb055f95 (diff) | |
| parent | 85f81f5ef5bd03e0f8ccbe4ae13eaacf2bdc939f (diff) | |
| download | nixpkgs-e5523cd7f69b3763bc920ea98711931776fc91f2.tar nixpkgs-e5523cd7f69b3763bc920ea98711931776fc91f2.tar.gz nixpkgs-e5523cd7f69b3763bc920ea98711931776fc91f2.tar.bz2 nixpkgs-e5523cd7f69b3763bc920ea98711931776fc91f2.tar.lz nixpkgs-e5523cd7f69b3763bc920ea98711931776fc91f2.tar.xz nixpkgs-e5523cd7f69b3763bc920ea98711931776fc91f2.tar.zst nixpkgs-e5523cd7f69b3763bc920ea98711931776fc91f2.zip | |
Merge #34338: gnutls: fix p11-kit test (failing/skipped)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/gnutls/3.6.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gnutls/3.6.nix b/pkgs/development/libraries/gnutls/3.6.nix index 9dc6d5389d9..35344dfde7d 100644 --- a/pkgs/development/libraries/gnutls/3.6.nix +++ b/pkgs/development/libraries/gnutls/3.6.nix @@ -11,9 +11,10 @@ callPackage ./generic.nix (args // rec { # Skip two tests introduced in 3.5.11. Probable reasons of failure: # - pkgconfig: building against the result won't work before installing # - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox + # Change p11-kit test to use pkg-config to find p11-kit postPatch = '' sed '2iexit 77' -i tests/pkgconfig.sh sed '/^void doit(void)/,$s/{/{ exit(77);/; t' -i tests/trust-store.c - # TODO: remove just this line on some rebuild + sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh ''; }) |