From 7ceece975d6ac4115f2c6a915a6ac8ccd11d9070 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Wed, 4 Sep 2024 23:58:25 +0200 Subject: [PATCH] tpm2-tss: test with better maintained swtpm Switch tpm2-tss to swtpm, which is more widely used than the IBM one. tpm2-tss contains tests for both TPM 2.0 emulators. This fixes a failing test, with the updated IBM sw tpm version. Signed-off-by: Markus Theil --- pkgs/development/libraries/tpm2-tss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index 6d3a29c28ba7..e0962119da5b 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub , autoreconfHook, autoconf-archive, pkg-config, doxygen, perl , openssl, json_c, curl, libgcrypt -, cmocka, uthash, ibm-sw-tpm2, iproute2, procps, which +, cmocka, uthash, swtpm, iproute2, procps, which , libuuid }: let @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ++ lib.optional doInstallCheck cmocka; nativeInstallCheckInputs = [ - cmocka which openssl procps_pkg iproute2 ibm-sw-tpm2 + cmocka which openssl procps_pkg iproute2 swtpm ]; strictDeps = true;