From c87b2a09dc702ed0077d9eafceaea4b5efdc5d4d Mon Sep 17 00:00:00 2001
From: Julian Stecklina <js@alien8.de>
Date: Fri, 25 Nov 2022 23:42:34 +0100
Subject: [PATCH] nix: fix lanzatool integration/merge mixup

---
 flake.nix                     | 6 ++----
 rust/lanzatool/src/cli.rs     | 4 +---
 rust/lanzatool/src/install.rs | 1 -
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index 83bca27..01203b6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -130,8 +130,7 @@
       '';
     in {
       overlays.default = final: prev: {
-        inherit lanzaboote;
-        lanzatool = lanzatoolBin;
+        inherit lanzatool;
       };
 
       nixosModules.lanzaboote = import ./nix/lanzaboote.nix;
@@ -158,7 +157,7 @@
         ];
 
         inputsFrom = [
-          lanzatool
+          lanzatoolBin
           lanzaboote
         ];
       };
@@ -188,7 +187,6 @@
               enable = true;
               enrollKeys = lib.mkDefault true;
               pkiBundle = ./pki;
-              package = lanzatool;
             };
           };
         };
diff --git a/rust/lanzatool/src/cli.rs b/rust/lanzatool/src/cli.rs
index 20490ec..69d0929 100644
--- a/rust/lanzatool/src/cli.rs
+++ b/rust/lanzatool/src/cli.rs
@@ -70,7 +70,6 @@ fn install(
 ) -> Result<()> {
     let lanzaboote_stub = std::env::var("LANZABOOTE_STUB")?;
     let initrd_stub = std::env::var("LANZABOOTE_INITRD_STUB")?;
-    let sbsigntool = std::env::var("SBSIGNTOOL")?;
 
     install::install(
         public_key,
@@ -78,8 +77,7 @@ fn install(
         pki_bundle,
         auto_enroll,
         bootspec,
-        Path::new(&sbsigntool),
         Path::new(&lanzaboote_stub),
-        Path::new(&initrd_stub)
+        Path::new(&initrd_stub),
     )
 }
diff --git a/rust/lanzatool/src/install.rs b/rust/lanzatool/src/install.rs
index 30e0fe8..6d28ed0 100644
--- a/rust/lanzatool/src/install.rs
+++ b/rust/lanzatool/src/install.rs
@@ -15,7 +15,6 @@ pub fn install(
     _pki_bundle: Option<PathBuf>,
     _auto_enroll: bool,
     bootspec: &Path,
-    sbsigntool: &Path,
     lanzaboote_stub: &Path,
     initrd_stub: &Path,
 ) -> Result<()> {