From 997fedf514a5daa0e2886e23d54760fb91947be8 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 20 May 2025 04:24:55 +0800
Subject: [PATCH] opencryptoki: 3.23.0 -> 3.24.0

Diff: https://github.com/opencryptoki/opencryptoki/compare/v3.23.0...v3.24.0

Changelog: https://github.com/opencryptoki/opencryptoki/blob/v3.24.0/ChangeLog
---
 pkgs/by-name/op/opencryptoki/package.nix | 26 +++++++++++++-----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/op/opencryptoki/package.nix b/pkgs/by-name/op/opencryptoki/package.nix
index 45e90cc1a346..5870a23d823e 100644
--- a/pkgs/by-name/op/opencryptoki/package.nix
+++ b/pkgs/by-name/op/opencryptoki/package.nix
@@ -9,23 +9,25 @@
   openssl,
   trousers,
   libcap,
+  getent,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "opencryptoki";
-  version = "3.23.0";
+  version = "3.24.0";
 
   src = fetchFromGitHub {
     owner = "opencryptoki";
     repo = "opencryptoki";
-    rev = "v${version}";
-    hash = "sha256-5FcvwGTzsL0lYrSYGlbSY89s6OKzg+2TRlwHlJjdzXo=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-GIcUI5Gjk+whwlD9dBiB2N7q6sPYFnhj5VvyQvc2Z2A=";
   };
 
   nativeBuildInputs = [
     autoreconfHook
     bison
     flex
+    getent
   ];
 
   buildInputs = [
@@ -37,6 +39,8 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace configure.ac \
+      --replace-fail "/usr/sbin/" "" \
+      --replace-fail "/bin/" "" \
       --replace-fail "usermod" "true" \
       --replace-fail "useradd" "true" \
       --replace-fail "groupadd" "true" \
@@ -53,16 +57,14 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  installFlags = [
-    "DESTDIR=${placeholder "out"}"
-  ];
+  installFlags = [ "DESTDIR=${placeholder "out"}" ];
 
-  meta = with lib; {
-    changelog = "https://github.com/opencryptoki/opencryptoki/blob/${src.rev}/ChangeLog";
+  meta = {
+    changelog = "https://github.com/opencryptoki/opencryptoki/blob/v${finalAttrs.version}/ChangeLog";
     description = "PKCS#11 implementation for Linux";
     homepage = "https://github.com/opencryptoki/opencryptoki";
-    license = licenses.cpl10;
+    license = lib.licenses.cpl10;
     maintainers = [ ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
-}
+})