diff options
author | Leon Schuermann <leon@is.currently.online> | 2020-06-16 12:47:37 +0200 |
---|---|---|
committer | Daniel Schaefer <git@danielschaefer.me> | 2020-06-17 16:46:18 +0200 |
commit | fb667c1beb7c67d131008fe4044f2f744d9dedcf (patch) | |
tree | cd38595b472853da7918ee95edf72f1300d12fb1 /pkgs/tools/security/tpm2-abrmd | |
parent | ef9e6b3aa8516fd68cdad91c19aed9be5b6fafa5 (diff) |
tpm2-abrmd: 2.2.0 -> 2.3.2
Diffstat (limited to 'pkgs/tools/security/tpm2-abrmd')
-rw-r--r-- | pkgs/tools/security/tpm2-abrmd/default.nix | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/pkgs/tools/security/tpm2-abrmd/default.nix index fbebde2e7bf60..76e511662bac8 100644 --- a/pkgs/tools/security/tpm2-abrmd/default.nix +++ b/pkgs/tools/security/tpm2-abrmd/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, lib -, tpm2-tss, pkgconfig, glib, which, dbus, cmocka }: +, makeWrapper, tpm2-tss, pkgconfig, glib, which, dbus, cmocka }: stdenv.mkDerivation rec { pname = "tpm2-abrmd"; - version = "2.2.0"; + version = "2.3.2"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "1lbfhyyh9k54r8s1h8ca2czxv4hg0yq984kdh3vqh3990aca0x9a"; + sha256 = "040d01pdzkj0nc1c0vsf6gfqf28cgil03ix8dasijvhiha4c20nz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ tpm2-tss glib which dbus cmocka ]; @@ -19,6 +19,14 @@ stdenv.mkDerivation rec { #configureFlags = [ "--enable-unit" ]; doCheck = false; + # Even though tpm2-tss is in the RUNPATH, starting from 2.3.0 abrmd + # seems to require the path to the device TCTI (used for accessing + # /dev/tpm0) in it's LD_LIBRARY_PATH + postFixup = '' + wrapProgram $out/bin/tpm2-abrmd \ + --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ tpm2-tss ]}" + ''; + meta = with lib; { description = "TPM2 resource manager, accessible via D-Bus"; homepage = "https://github.com/tpm2-software/tpm2-tools"; |