From 48cb9f63bb3d38d22038eb55b05bfba6a245cf0a Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 21 Dec 2020 12:24:52 +0100
Subject: fixup! tpm2-tss-engine: init at 1.1.0

---
 pkgs/tools/security/tpm2-tss-engine/default.nix | 40 ++++++++++++++++++-------
 1 file changed, 29 insertions(+), 11 deletions(-)

(limited to 'pkgs/tools/security/tpm2-tss-engine/default.nix')

diff --git a/pkgs/tools/security/tpm2-tss-engine/default.nix b/pkgs/tools/security/tpm2-tss-engine/default.nix
index f24b8028abbd..192d9709ee70 100644
--- a/pkgs/tools/security/tpm2-tss-engine/default.nix
+++ b/pkgs/tools/security/tpm2-tss-engine/default.nix
@@ -2,10 +2,17 @@
 , fetchFromGitHub
 , lib
 , pkg-config
+, autoreconfHook
+, autoconf
+, autoconf-archive
+, automake
+, libtool
 , makeWrapper
 , curl
 , openssl
 , tpm2-tss
+, pandoc
+, doxygen
 }:
 
 stdenv.mkDerivation rec {
@@ -19,21 +26,32 @@ stdenv.mkDerivation rec {
     sha256 = "1pwc38izkk50s73xzcca1l5h265lmh4hcgpfq8lmbv5grq2qdal8";
   };
 
-  nativeBuildInputs = [ pkg-config makeWrapper ];
+  nativeBuildInputs = [
+    pkg-config
+    makeWrapper
+    autoreconfHook
+    autoconf
+    autoconf-archive
+    automake
+    libtool
+    pandoc
+    doxygen
+  ];
+
   buildInputs = [
     curl openssl tpm2-tss
   ];
 
-  #preFixup = let
-  #  ldLibraryPath = lib.makeLibraryPath ([
-  #    tpm2-tss
-  #  ];
-  #in ''
-  #  for bin in $out/bin/*; do
-  #    wrapProgram $bin \
-  #      --suffix LD_LIBRARY_PATH : "${ldLibraryPath}"
-  #  done
-  #'';
+  preFixup = let
+    ldLibraryPath = lib.makeLibraryPath ([
+      tpm2-tss
+    ]);
+  in ''
+    for bin in $out/bin/*; do
+      wrapProgram $bin \
+        --suffix LD_LIBRARY_PATH : "${ldLibraryPath}"
+    done
+  '';
 
   meta = with lib; {
     description = "OpenSSL Engine for TPM2 devices";
-- 
cgit v1.2.3