From 61d43e92fd7530d0162d9125a6cb9f27b4e1e32c Mon Sep 17 00:00:00 2001
From: Travis Staton <tstaton@mercury.com>
Date: Mon, 4 Nov 2024 22:57:26 -0500
Subject: [PATCH] use config.system.boot.loader.kernelFile

---
 rpi/default.nix      | 2 +-
 sd-image/default.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rpi/default.nix b/rpi/default.nix
index c6d73ce..339d3f0 100644
--- a/rpi/default.nix
+++ b/rpi/default.nix
@@ -102,7 +102,7 @@ in
                 TARGET_FIRMWARE_DIR="${firmware-path}"
                 TARGET_OVERLAYS_DIR="$TARGET_FIRMWARE_DIR/overlays"
                 TMPFILE="$TARGET_FIRMWARE_DIR/tmp"
-                KERNEL="${kernel}/Image"
+                KERNEL="${kernel}/${config.system.boot.loader.kernelFile}"
                 SHOULD_UBOOT=${if cfg.uboot.enable then "1" else "0"}
                 SRC_FIRMWARE_DIR="${pkgs.raspberrypifw}/share/raspberrypi/boot"
                 STARTFILES=("$SRC_FIRMWARE_DIR"/start*.elf)
diff --git a/sd-image/default.nix b/sd-image/default.nix
index 99a1be4..931fb29 100644
--- a/sd-image/default.nix
+++ b/sd-image/default.nix
@@ -31,7 +31,7 @@
         cfg = config.raspberry-pi-nix;
         version = cfg.kernel-version;
         board = cfg.board;
-        kernel = config.system.build.kernel;
+        kernel = "${config.system.build.kernel}/${config.system.boot.loader.kernelFile}";
         initrd = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}";
         populate-kernel =
           if cfg.uboot.enable
@@ -39,7 +39,7 @@
             cp ${cfg.uboot.package}/u-boot.bin firmware/u-boot-rpi-arm64.bin
           ''
           else ''
-            cp "${kernel}/Image" firmware/kernel.img
+            cp "${kernel}" firmware/kernel.img
             cp "${initrd}" firmware/initrd
             cp "${kernel-params}" firmware/cmdline.txt
           '';