From a5d537badb0018de2c36b18fb0f0f748f096b524 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Sat, 10 May 2025 10:34:42 +0200 Subject: [PATCH] swtpm: fix swtpm_setup and swtpm_localca not finding own binaries Workaround for https://github.com/stefanberger/swtpm/issues/795 ``` arian@Mac nixpkgs % ./result/bin/swtpm_setup --tpm-state /tmp/lol Default TPM 'swtpm' could not be found and was not provided using --tpm. ``` --- pkgs/by-name/sw/swtpm/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/sw/swtpm/package.nix b/pkgs/by-name/sw/swtpm/package.nix index e339361f440c..a109e5efaacd 100644 --- a/pkgs/by-name/sw/swtpm/package.nix +++ b/pkgs/by-name/sw/swtpm/package.nix @@ -16,6 +16,7 @@ socat, gnutls, perl, + makeWrapper, # Tests python3, @@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { perl # for pod2man python3 autoreconfHook + makeWrapper ]; nativeCheckInputs = [ @@ -113,6 +115,12 @@ stdenv.mkDerivation (finalAttrs: { 'LC_ALL=C.UTF-8 certtool' ''; + # Workaround for https://github.com/stefanberger/swtpm/issues/795 + postFixup = '' + wrapProgram "$out/bin/swtpm_localca" --suffix PATH : "$out/bin" + wrapProgram "$out/bin/swtpm_setup" --suffix PATH : "$out/bin" + ''; + doCheck = true; enableParallelBuilding = true;