diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-05-07 17:46:11 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-05-07 17:46:11 +0000 |
| commit | 0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea (patch) | |
| tree | ad528e0ffd64d471f2bf250670c0732bff57e86b /nixpkgs/pkgs/tools/security/rng-tools | |
| parent | 373507e28edeacd168b5c240840db2dac854882a (diff) | |
| parent | 2ec5e9595becf05b052ce4c61a05d87ce95d19af (diff) | |
| download | nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.gz nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.bz2 nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.lz nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.xz nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.zst nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.zip | |
Merge commit '2ec5e9595becf05b052ce4c61a05d87ce95d19af'
Diffstat (limited to 'nixpkgs/pkgs/tools/security/rng-tools')
| -rw-r--r-- | nixpkgs/pkgs/tools/security/rng-tools/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/tools/security/rng-tools/default.nix b/nixpkgs/pkgs/tools/security/rng-tools/default.nix index 3e460c5f8448..41faa375f83d 100644 --- a/nixpkgs/pkgs/tools/security/rng-tools/default.nix +++ b/nixpkgs/pkgs/tools/security/rng-tools/default.nix @@ -8,7 +8,7 @@ # Not sure if jitterentropy is safe to use for cryptography # and thus a default entropy source , jitterentropy ? null, withJitterEntropy ? false -, libp11 ? null, withPkcs11 ? true +, libp11 ? null, opensc ? null, withPkcs11 ? true }: with stdenv.lib; @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { postPatch = '' cp README.md README + + ${optionalString withPkcs11 '' + substituteInPlace rngd.c \ + --replace /usr/lib64/opensc-pkcs11.so ${opensc}/lib/opensc-pkcs11.so + ''} ''; nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; @@ -40,7 +45,7 @@ stdenv.mkDerivation rec { buildInputs = [ sysfsutils ] ++ optionals withGcrypt [ libgcrypt ] ++ optionals withJitterEntropy [ jitterentropy ] - ++ optionals withNistBeacon [ openssl curl libxml2 ] + ++ optionals withNistBeacon [ curl libxml2 openssl ] ++ optionals withPkcs11 [ libp11 openssl ]; # This shouldn't be necessary but is as of 6.7 |