diff options
author | Dylan Simon <dylan@dylex.net> | 2018-01-27 12:39:02 -0500 |
---|---|---|
committer | Dylan Simon <dylan@dylex.net> | 2018-01-27 12:39:02 -0500 |
commit | 85f81f5ef5bd03e0f8ccbe4ae13eaacf2bdc939f (patch) | |
tree | 93a13685151a2c464cf0f417340e5bb85741d7ae /pkgs/development/libraries/gnutls | |
parent | e39f2115751df8dcfb6a710e2a4fea657ce14427 (diff) | |
download | nixlib-85f81f5ef5bd03e0f8ccbe4ae13eaacf2bdc939f.tar nixlib-85f81f5ef5bd03e0f8ccbe4ae13eaacf2bdc939f.tar.gz nixlib-85f81f5ef5bd03e0f8ccbe4ae13eaacf2bdc939f.tar.bz2 nixlib-85f81f5ef5bd03e0f8ccbe4ae13eaacf2bdc939f.tar.lz nixlib-85f81f5ef5bd03e0f8ccbe4ae13eaacf2bdc939f.tar.xz nixlib-85f81f5ef5bd03e0f8ccbe4ae13eaacf2bdc939f.tar.zst nixlib-85f81f5ef5bd03e0f8ccbe4ae13eaacf2bdc939f.zip |
gnutls: fix (failing) p11-kit test
The p11-kit-trust test looks in /usr/lib for pkcs11 modules. As a result it is unnecessarily skipped on sandboxed builds, and fails on unsandboxed builds with a system p11-kit. Replace hard-coded /usr/lib paths with pkg-config.
Diffstat (limited to 'pkgs/development/libraries/gnutls')
-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 9dc6d5389d9c..35344dfde7df 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 ''; }) |