From 7f88c4cf8d002876c80f99737b3aff1d83f9d1d5 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Tue, 2 Sep 2025 12:20:01 +0800
Subject: [PATCH 1/4] tpm-tools: 1.3.9.1 -> 1.3.9.2

---
 pkgs/by-name/tp/tpm-tools/package.nix | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/tp/tpm-tools/package.nix b/pkgs/by-name/tp/tpm-tools/package.nix
index abfc81a93d59..062e2258a313 100644
--- a/pkgs/by-name/tp/tpm-tools/package.nix
+++ b/pkgs/by-name/tp/tpm-tools/package.nix
@@ -2,34 +2,35 @@
   lib,
   stdenv,
   fetchurl,
+  autoreconfHook,
   trousers,
   openssl,
   opencryptoki,
   perl,
 }:
 
-let
-  version = "1.3.9.1";
-in
 stdenv.mkDerivation rec {
   pname = "tpm-tools";
-  inherit version;
+  version = "1.3.9.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/trousers/tpm-tools/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0s7srgghykxnlb1g4izabzf2gfb1knxc0nzn6bly49h8cpi19dww";
+    url = "mirror://sourceforge/trousers/tpm-tools/${version}/tpm-tools-${version}.tar.gz";
+    hash = "sha256-ivg3lJouwwsZU4msiisxvEn+MVBQdRt9TQ1DK/eBKpc=";
   };
 
-  sourceRoot = ".";
+  postPatch = ''
+    mkdir -p po
+    mkdir -p m4
+    cp -R po_/* po/
+    touch po/Makefile.in.in
+    touch m4/Makefile.am
+  '';
 
-  patches = [
-    (fetchurl {
-      url = "https://sources.debian.org/data/main/t/tpm-tools/1.3.9.1-0.1/debian/patches/05-openssl1.1_fix_data_mgmt.patch";
-      sha256 = "161yysw4wgy3spsz6p1d0ib0h5pnrqm8bdh1l71c4hz6a6wpcyxj";
-    })
+  nativeBuildInputs = [
+    autoreconfHook
+    perl
   ];
 
-  nativeBuildInputs = [ perl ];
   buildInputs = [
     trousers
     openssl

From ba74bf68a25be83cd265a3de3ae7147568b5d1df Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Tue, 2 Sep 2025 12:20:42 +0800
Subject: [PATCH 2/4] tpm-tools: use finalAttrs

---
 pkgs/by-name/tp/tpm-tools/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tp/tpm-tools/package.nix b/pkgs/by-name/tp/tpm-tools/package.nix
index 062e2258a313..d6ee0a09135d 100644
--- a/pkgs/by-name/tp/tpm-tools/package.nix
+++ b/pkgs/by-name/tp/tpm-tools/package.nix
@@ -9,12 +9,12 @@
   perl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tpm-tools";
   version = "1.3.9.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/trousers/tpm-tools/${version}/tpm-tools-${version}.tar.gz";
+    url = "mirror://sourceforge/trousers/tpm-tools/${finalAttrs.version}/tpm-tools-${finalAttrs.version}.tar.gz";
     hash = "sha256-ivg3lJouwwsZU4msiisxvEn+MVBQdRt9TQ1DK/eBKpc=";
   };
 
@@ -49,4 +49,4 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.ak ];
     platforms = platforms.unix;
   };
-}
+})

From 7fe40d5d5f588cd6344881db9feddb16a82df01a Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Tue, 2 Sep 2025 12:21:10 +0800
Subject: [PATCH 3/4] tpm-tools: remove with lib

---
 pkgs/by-name/tp/tpm-tools/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/tp/tpm-tools/package.nix b/pkgs/by-name/tp/tpm-tools/package.nix
index d6ee0a09135d..4fa309f49244 100644
--- a/pkgs/by-name/tp/tpm-tools/package.nix
+++ b/pkgs/by-name/tp/tpm-tools/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     opencryptoki
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Management tools for TPM hardware";
     longDescription = ''
       tpm-tools is an open-source package designed to enable user and
@@ -45,8 +45,8 @@ stdenv.mkDerivation (finalAttrs: {
       Module (TPM), similar to a smart card environment.
     '';
     homepage = "https://sourceforge.net/projects/trousers/files/tpm-tools/";
-    license = licenses.cpl10;
-    maintainers = [ maintainers.ak ];
-    platforms = platforms.unix;
+    license = lib.licenses.cpl10;
+    maintainers = [ lib.maintainers.ak ];
+    platforms = lib.platforms.unix;
   };
 })

From 3410cc904208b79b12cc77a165c41e69f9fbfa3c Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Tue, 2 Sep 2025 12:49:33 +0800
Subject: [PATCH 4/4] tpm-tools: fix libopencryptoki.so

---
 pkgs/by-name/tp/tpm-tools/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/tp/tpm-tools/package.nix b/pkgs/by-name/tp/tpm-tools/package.nix
index 4fa309f49244..666ad64a6a5f 100644
--- a/pkgs/by-name/tp/tpm-tools/package.nix
+++ b/pkgs/by-name/tp/tpm-tools/package.nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
     cp -R po_/* po/
     touch po/Makefile.in.in
     touch m4/Makefile.am
+    substituteInPlace include/tpm_pkcs11.h \
+      --replace-fail "libopencryptoki.so" "${opencryptoki}/lib/opencryptoki/libopencryptoki.so"
   '';
 
   nativeBuildInputs = [