sysinfo-daemon: cleanup

1 files changed, 49 insertions, 20 deletions

diff --git a/px/packages/device.scm b/px/packages/device.scm
index d0288d8..a358494 100644
--- a/px/packages/device.scm
+++ b/px/packages/device.scm
@@ -428,23 +428,52 @@ configuration file from commandline args and upload results to the server")
 
 (define-public sysinfo-daemon
   (package
-    (name "sysinfo-daemon")
-    (version "0.0.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://source.pantherx.org/" name "_v" version
-                           ".tgz"))
-       (sha256
-        (base32 "0cngbrwanmc65fmnglrkl36sqq6wljsr301fg65msiq3a9zbnkjk"))))
-    (build-system python-build-system)
-    (inputs `(("python-requests" ,python-requests)
-              ("python-py-cpuinfo" ,python-py-cpuinfo)
-              ("px-python-shared" ,px-python-shared)))
-    (native-inputs `(("pkg-config" ,pkg-config)))
-    (propagated-inputs `(("px-device-identity" ,px-device-identity)))
-    (home-page "https://www.pantherx.org/")
-    (synopsis "Collect and submit detailed system info")
-    (description
-     "Submit detailed system information")
-    (license license:expat)))
+   (name "sysinfo-daemon")
+   (version "0.0.3")
+   (source
+    (origin
+     (method url-fetch)
+     (uri (string-append "https://source.pantherx.org/" name "_v" version
+                         ".tgz"))
+     (sha256
+      (base32 "0cngbrwanmc65fmnglrkl36sqq6wljsr301fg65msiq3a9zbnkjk"))))
+   (build-system python-build-system)
+   (arguments
+    `(#:tests? #f
+      #:phases 
+      (modify-phases
+       %standard-phases
+       (add-after 'install 'wrap-for-openssl-tss2-conf
+		  (lambda* (#:key outputs #:allow-other-keys)
+		    (let ((out (assoc-ref outputs "out"))
+			  (openssl (assoc-ref %build-inputs "openssl"))
+			  (tpm2-tss (assoc-ref %build-inputs "tpm2-tss"))
+			  (tpm2-tss-engine (assoc-ref %build-inputs "tpm2-tss-engine")))
+		      (wrap-program (string-append out "/bin/sysinfo-daemon")
+				    `("OPENSSL_CONF" ":" prefix
+				      (,(string-append tpm2-tss-engine
+						       "/etc/openssl-tss2.conf")))
+				    `("PATH" ":" prefix
+				      (,(string-append tpm2-tss-engine "/bin/") 
+				       ,(string-append openssl "/bin/")))
+				    `("TPM2TSSENGINE_TCTI" ":" prefix
+				      (,(string-append tpm2-tss
+						       "/lib/libtss2-tcti-device.so:/dev/tpm0")))
+				    `("TPM2TOOLS_TCTI" ":" prefix
+				      (,(string-append tpm2-tss
+						       "/lib/libtss2-tcti-device.so:/dev/tpm0"))))
+		      #t)))
+       (delete 'sanity-check))))
+   (inputs `(("openssl" ,openssl-1.1)
+             ("tpm2-tss" ,tpm2-tss-openssl-1.1)
+             ("tpm2-tss-engine" ,tpm2-tss-engine)))
+   (native-inputs `(("pkg-config" ,pkg-config)))
+   (propagated-inputs `(("px-device-identity" ,px-device-identity)
+                        ("python-py-cpuinfo" ,python-py-cpuinfo)
+                        ("python-requests" ,python-requests)
+                        ("px-python-shared" ,px-python-shared)))
+   (home-page "https://www.pantherx.org/")
+   (synopsis "Collect and submit detailed system info")
+   (description
+    "Submit detailed system information")
+   (license license:expat)))