colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tpm2-tools: rework argv0 parsing

Browse Source 
`tpm2 --version` relies on `ARGV[0]` being `tpm2` which is not possible
with `makeWrapper`.

this pulls the fix from https://github.com/tpm2-software/tpm2-tools/pull/3271

Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
This commit is contained in:
Arthur Gautier 2023-07-27 07:11:27 +00:00
parent 66ce081faf
commit b76822209a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/security/tpm2-tools/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, lib
{ stdenv, fetchurl, lib, fetchpatch
, pandoc, pkg-config, makeWrapper, curl, openssl, tpm2-tss, libuuid
, abrmdSupport ? true, tpm2-abrmd ? null }:
@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-H9tJxzBTe/2u0IiISIGmHjv9Eh6VfsC9zu7AJhI2wSM=";
};
patches = [
# https://github.com/tpm2-software/tpm2-tools/pull/3271
(fetchpatch {
url = "https://github.com/tpm2-software/tpm2-tools/commit/b98be08f6f88b0cca9e0667760c4e1e5eb417fbd.patch";
sha256 = "sha256-2sEam9i4gwscJhLwraX2EAjVM8Dh1vmNnG3zYsOF0fc=";
})
];
nativeBuildInputs = [ pandoc pkg-config makeWrapper ];
buildInputs = [
curl openssl tpm2-tss libuuid