Merge pull request #156889 from c0bw3b/fix/rng-tools

rng-tools: fix path to opensc-pkcs11 shared lib
This commit is contained in:
Renaud 2022-01-26 20:44:19 +01:00 committed by GitHub
commit 3095cedba1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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";