Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gnutls: fix (failing) p11-kit test #34338

Merged
merged 1 commit into from Jan 28, 2018
Merged

gnutls: fix (failing) p11-kit test #34338

merged 1 commit into from Jan 28, 2018

Conversation

dylex
Copy link
Contributor

@dylex dylex commented Jan 27, 2018

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.

Motivation for this change

p11-kit-trust test was failing on my unsandboxed build because the system p11-kit-trust module was found instead, and skipped on normal builds because it wasn't looking in p11_kit. pkg-config knows where it is and tests pass in both cases.

Happy to change if there's a better way to search for this library (e.g., $buildInputs or patch in hard-coded path) or it would be better to just force skip the test regardless.

This test does not exist (in this form anyway) in gnutls 3.5.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

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.
@adisbladis
Copy link
Member

cc maintainers @eelco @wkennington @fpletz

@vcunat vcunat changed the base branch from master to staging January 28, 2018 17:01
@vcunat
Copy link
Member

vcunat commented Jan 28, 2018

@vcunat vcunat merged commit 85f81f5 into NixOS:staging Jan 28, 2018
@dylex dylex deleted the gnutls branch October 9, 2019 01:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants