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.

Sign up for GitHub

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

Jump to bottom

rng-tools: fix missing opensc reference #60247

Merged
merged 1 commit into from Apr 26, 2019
Merged

rng-tools: fix missing opensc reference #60247

merged 1 commit into from Apr 26, 2019

Conversation

peterhoeg
Copy link
Member

Motivation for this change

PKCS11 support wasn't actually working due to a missing library reference.

Cc: @JohnAZoidberg

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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 nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@JohnAZoidberg JohnAZoidberg mentioned this pull request Apr 26, 2019
Closed
JohnAZoidberg
JohnAZoidberg reviewed Apr 26, 2019
View reviewed changes
pkgs/tools/security/rng-tools/default.nix Outdated
@@ -41,7 +46,7 @@ stdenv.mkDerivation rec {
++ optionals withGcrypt [ libgcrypt ]
++ optionals withJitterEntropy [ jitterentropy ]
++ optionals withNistBeacon [ openssl curl libxml2 ]
++ optionals withPkcs11 [ libp11 openssl ];
++ optionals withPkcs11 [ libp11 opensc openssl ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you need it here? I pretty sure nix is smart enough to propagate opensc as a dependency just because the path is in the source file.
It doesn't actually use it as a regular library - it really just needs the path there and OpenSSL will load it on demand.
I guess it's up to taste whether to include it here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's technically not needed, you're right, so let's get rid of it.

@peterhoeg peterhoeg merged commit 9d7afd0 into NixOS:master Apr 26, 2019
@peterhoeg peterhoeg deleted the f/rng branch April 26, 2019 07:56
@peterhoeg peterhoeg restored the f/rng branch April 28, 2019 14:24
@peterhoeg peterhoeg deleted the f/rng branch April 29, 2019 07:41
@peterhoeg peterhoeg restored the f/rng branch April 30, 2019 01:16
@peterhoeg peterhoeg deleted the f/rng branch April 30, 2019 09:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JohnAZoidberg JohnAZoidberg JohnAZoidberg approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@peterhoeg @JohnAZoidberg