From 75f77e757039e1ef61d1b4c27cde0c8ec0d019c1 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Wed, 21 May 2025 01:01:26 -0700
Subject: [PATCH] tpm2-pkcs11: export abrmd passthru

security.tpm2 should depend on this for the default PKCS#11 module.
---
 pkgs/by-name/tp/tpm2-pkcs11/package.nix | 30 ++++++++++++++++---------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/tp/tpm2-pkcs11/package.nix b/pkgs/by-name/tp/tpm2-pkcs11/package.nix
index ac79ea43d0cf..17d53d293bbf 100644
--- a/pkgs/by-name/tp/tpm2-pkcs11/package.nix
+++ b/pkgs/by-name/tp/tpm2-pkcs11/package.nix
@@ -222,18 +222,26 @@ chosenStdenv.mkDerivation (finalAttrs: {
         $out/lib/libtpm2_pkcs11.so.0.0.0
     '';
 
-  passthru = {
+  passthru = rec {
+    esapi = tpm2-pkcs11-esapi;
+    fapi = tpm2-pkcs11-fapi;
+    abrmd = tpm2-pkcs11.override {
+      abrmdSupport = true;
+    };
+    esapi-abrmd = tpm2-pkcs11-esapi.override {
+      abrmdSupport = true;
+    };
+    fapi-abrmd = tpm2-pkcs11-fapi.override {
+      abrmdSupport = true;
+    };
     tests = {
-      inherit tpm2-pkcs11-esapi tpm2-pkcs11-fapi;
-      tpm2-pkcs11-abrmd = tpm2-pkcs11.override {
-        abrmdSupport = true;
-      };
-      tpm2-pkcs11-esapi-abrmd = tpm2-pkcs11-esapi.override {
-        abrmdSupport = true;
-      };
-      tpm2-pkcs11-fapi-abrmd = tpm2-pkcs11-fapi.override {
-        abrmdSupport = true;
-      };
+      inherit
+        esapi
+        fapi
+        abrmd
+        esapi-abrmd
+        fapi-abrmd
+        ;
     };
   };