mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
Merge pull request #315516 from numinit/pkcs11-provider-0.4
pkcs11-provider: 0.3 -> 0.4
This commit is contained in:
commit
d30d6a5313
@ -1,33 +1,39 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, openssl, nss, p11-kit
|
||||
, opensc, gnutls, expect
|
||||
, autoreconfHook, autoconf-archive, pkg-config
|
||||
, meson, ninja, pkg-config
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pkcs11-provider";
|
||||
version = "0.3";
|
||||
version = "0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "latchset";
|
||||
repo = "pkcs11-provider";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jEQYsINRZ7bi2UqOXUUmGpm+1h+1qBNe18KvfAw2JzU=";
|
||||
hash = "sha256-f4BbW2awSXS1srSkn1CTRCqNp+2pvVpc4YL79Ht0w0A=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl nss p11-kit ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config autoconf-archive ];
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
|
||||
# don't add SoftHSM to here: https://github.com/openssl/openssl/issues/22508
|
||||
nativeCheckInputs = [ p11-kit.bin opensc nss.tools gnutls openssl.bin expect ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs --build .
|
||||
'';
|
||||
|
||||
# Makefile redirects to logfiles; make sure we can catch them.
|
||||
for name in softokn softhsm; do
|
||||
ln -s /dev/stderr tests/setup-$name.log
|
||||
preInstall = ''
|
||||
# Meson tries to install to `$out/$out` and `$out/''${openssl.out}`; so join them.
|
||||
mkdir -p "$out"
|
||||
for dir in "$out" "${openssl.out}"; do
|
||||
mkdir -p .install/"$(dirname -- "$dir")"
|
||||
ln -s "$out" ".install/$dir"
|
||||
done
|
||||
export DESTDIR="$(realpath .install)"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@ -37,6 +43,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version-regex" "v(\d\.\d)"];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/latchset/pkcs11-provider";
|
||||
description = "An OpenSSL 3.x provider to access hardware or software tokens using the PKCS#11 Cryptographic Token Interface";
|
||||
|
Loading…
Reference in New Issue
Block a user