diff options
author | Robert Scott <code@humanleg.org.uk> | 2023-02-13 22:19:04 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-13 22:19:04 +0000 |
commit | bb31eda336aebf1d30ffde1f1034e78d97e1b112 (patch) | |
tree | a54ed20b0b87c0d89b4c01971edde419722322ab /pkgs/tools/security | |
parent | f1787f39a53c078519aed75aa9ac511479e537b1 (diff) | |
parent | 08834266e1f49e824a2057f1c7b6eb06d8409a68 (diff) |
Merge pull request #215543 from dotlambda/opencryptoki-3.19.0
opencryptoki: 3.8.2 -> 3.19.0
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r-- | pkgs/tools/security/opencryptoki/default.nix | 36 |
1 files changed, 29 insertions, 7 deletions
diff --git a/pkgs/tools/security/opencryptoki/default.nix b/pkgs/tools/security/opencryptoki/default.nix index 140f032a5fde8..dcb1c0bb0cbe8 100644 --- a/pkgs/tools/security/opencryptoki/default.nix +++ b/pkgs/tools/security/opencryptoki/default.nix @@ -1,18 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, openssl, trousers, autoreconfHook, libtool, bison, flex }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, bison +, flex +, openldap +, openssl +, trousers +}: stdenv.mkDerivation rec { pname = "opencryptoki"; - version = "3.8.2"; + version = "3.19.0"; src = fetchFromGitHub { owner = "opencryptoki"; repo = "opencryptoki"; rev = "v${version}"; - sha256 = "1rf7cmibmx636vzv7p54g212478a8wim2lfjf2861hfd0m96nv4l"; + hash = "sha256-ym13I34H3d1JuVBnItkceUbqpjYFhD+mPgWYHPetF7Y="; }; - nativeBuildInputs = [ autoreconfHook libtool bison flex ]; - buildInputs = [ openssl trousers ]; + nativeBuildInputs = [ + autoreconfHook + bison + flex + ]; + + buildInputs = [ + openldap + openssl + trousers + ]; postPatch = '' substituteInPlace configure.ac \ @@ -20,18 +38,22 @@ stdenv.mkDerivation rec { --replace "groupadd" "true" \ --replace "chmod" "true" \ --replace "chgrp" "true" - substituteInPlace usr/lib/Makefile.am --replace "DESTDIR" "out" ''; configureFlags = [ - "--prefix=$(out)" + "--prefix=" "--disable-ccatok" "--disable-icatok" ]; enableParallelBuilding = true; + installFlags = [ + "DESTDIR=${placeholder "out"}" + ]; + meta = with lib; { + changelog = "https://github.com/opencryptoki/opencryptoki/blob/${src.rev}/ChangeLog"; description = "PKCS#11 implementation for Linux"; homepage = "https://github.com/opencryptoki/opencryptoki"; license = licenses.cpl10; |