From bcad59a20aa0a5f80b17863e0f617349017f6b59 Mon Sep 17 00:00:00 2001
From: Julian Stecklina <js@alien8.de>
Date: Tue, 22 Nov 2022 00:42:41 +0100
Subject: [PATCH] Move uefi-run into its own Nix file

---
 flake.nix        | 30 +++++++++---------------------
 nix/uefi-run.nix | 17 +++++++++++++++++
 2 files changed, 26 insertions(+), 21 deletions(-)
 create mode 100644 nix/uefi-run.nix

diff --git a/flake.nix b/flake.nix
index 0bf07f0..caeca69 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,11 +16,12 @@
         ];
       };
 
-      rust = pkgs.rust-bin.fromRustupToolchainFile ./rust/rust-toolchain.toml;
+      rust-nightly = pkgs.rust-bin.fromRustupToolchainFile ./rust/rust-toolchain.toml;
 
-      naersk' = pkgs.callPackage naersk {
-        cargo = rust;
-        rustc = rust;
+      naersk-stable = pkgs.callPackage naersk {};
+      naersk-nightly = pkgs.callPackage naersk {
+        cargo = rust-nightly;
+        rustc = rust-nightly;
       };
 
       qemuUefi = pkgs.writeShellScriptBin "qemu-uefi" ''
@@ -29,21 +30,8 @@
               -m 4096 -serial stdio "$@"
           '';
 
-      uefi-run = naersk'.buildPackage {
-        src = pkgs.fetchFromGitHub {
-          owner = "Richard-W";
-          repo = "uefi-run";
-
-          rev = "8ba33c934525458a784a6620705bcf46c3ca91d2";
-          sha256 = "fwzWdOinW/ECVI/65pPB1shxPdl2nZThAqlg8wlWg/g=";
-        };
-
-        nativeBuildInputs = [ pkgs.makeWrapper ];
-
-        postInstall = ''
-          wrapProgram "$out/bin/uefi-run" \
-            --add-flags '--bios-path ${pkgs.OVMF.fd}/FV/OVMF.fd --qemu-path ${pkgs.qemu}/bin/qemu-system-x86_64'
-        '';
+      uefi-run = pkgs.callPackage ./nix/uefi-run.nix {
+        naersk = naersk-stable;
       };
 
       systemd-boot-run = pkgs.writeShellScriptBin "systemd-boot-run" ''
@@ -69,7 +57,7 @@
            "$IN" "$OUT"
       '';
       
-      lanzaboote = naersk'.buildPackage {
+      lanzaboote = naersk-nightly.buildPackage {
         src = ./rust;
         cargoBuildOptions = old: old ++ [
           "--target x86_64-unknown-uefi"
@@ -103,7 +91,7 @@
           nativeBuildInputs = [
             qemuUefi
             uefi-run
-            rust
+            rust-nightly
             pkgs.pev
             add-sections
           ];
diff --git a/nix/uefi-run.nix b/nix/uefi-run.nix
new file mode 100644
index 0000000..f2ae3b6
--- /dev/null
+++ b/nix/uefi-run.nix
@@ -0,0 +1,17 @@
+{ fetchFromGitHub, naersk, makeWrapper, OVMF, qemu }:
+naersk.buildPackage {
+  src = fetchFromGitHub {
+    owner = "Richard-W";
+    repo = "uefi-run";
+
+    rev = "8ba33c934525458a784a6620705bcf46c3ca91d2";
+    sha256 = "fwzWdOinW/ECVI/65pPB1shxPdl2nZThAqlg8wlWg/g=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postInstall = ''
+    wrapProgram "$out/bin/uefi-run" \
+      --add-flags '--bios-path ${OVMF.fd}/FV/OVMF.fd --qemu-path ${qemu}/bin/qemu-system-x86_64'
+  '';
+}