diff options
| author | Renaud <c0bw3b@users.noreply.github.com> | 2022-01-26 19:35:15 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-01-26 19:50:02 +0000 |
| commit | d627a50513df212c12a07c15c73b1fb8c76d098b (patch) | |
| tree | 3a4fdc1b6495175cab4e677eaeaec14db33ba847 | |
| parent | Merge pull request #156848 from FliegendeWurst/21.11-go-1.17.5 (diff) | |
| download | nixpkgs-d627a50513df212c12a07c15c73b1fb8c76d098b.tar.gz | |
rng-tools: fix path to opensc-pkcs11.so
Changes upstream made the patching on rngd.c irrelevant
(cherry picked from commit 96e055fba48de677035da731594a38faa7a9e277)
| -rw-r--r-- | pkgs/tools/security/rng-tools/default.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index 76aea2bbd514..47bf2c8297f8 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -23,13 +23,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-qheJaeVX2zuv0mvKEd6wcbSHFjiJE0t5hVCJiRSKm3M="; }; - postPatch = '' - ${optionalString withPkcs11 '' - substituteInPlace rngd.c \ - --replace /usr/lib64/opensc-pkcs11.so ${opensc}/lib/opensc-pkcs11.so - ''} - ''; - nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; configureFlags = [ @@ -49,8 +42,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # For cross-compilation - makeFlags = [ "AR:=$(AR)" ]; + makeFlags = [ + "AR:=$(AR)" # For cross-compilation + ] ++ optionals (withPkcs11) [ + "PKCS11_ENGINE=${opensc}/lib/opensc-pkcs11.so" # Overrides configure script paths + ]; doCheck = true; preCheck = "patchShebangs tests/*.sh"; |