From ecc8ca530d788c49b79de8a9e1bb665626d1b89b Mon Sep 17 00:00:00 2001
From: Travis Staton <tstaton@mercury.com>
Date: Mon, 4 Nov 2024 22:43:44 -0500
Subject: [PATCH] only mention rpi-kernels when overriding kernel

so that migrations / sd-image building work if there are additional kernel
overrides
---
 rpi/default.nix      | 4 ++--
 sd-image/default.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rpi/default.nix b/rpi/default.nix
index 02b582a..c5a9d49 100644
--- a/rpi/default.nix
+++ b/rpi/default.nix
@@ -5,7 +5,7 @@ let
   cfg = config.raspberry-pi-nix;
   version = cfg.kernel-version;
   board = cfg.board;
-  kernel = pkgs.rpi-kernels."${version}"."${board}";
+  kernel = config.system.build.kernel;
 in
 {
   imports = [ ../sd-image ./config.nix ./i2c.nix ];
@@ -323,7 +323,7 @@ in
           "reset-raspberrypi" # required for vl805 firmware to load
         ];
       };
-      kernelPackages = pkgs.linuxPackagesFor kernel;
+      kernelPackages = pkgs.linuxPackagesFor pkgs.rpi-kernels."${version}"."${board}";
       loader = {
         grub.enable = lib.mkDefault false;
         initScript.enable = !cfg.uboot.enable;
diff --git a/sd-image/default.nix b/sd-image/default.nix
index 9e9930a..212634d 100644
--- a/sd-image/default.nix
+++ b/sd-image/default.nix
@@ -22,7 +22,7 @@
         cfg = config.raspberry-pi-nix;
         version = cfg.kernel-version;
         board = cfg.board;
-        kernel = pkgs.rpi-kernels."${version}"."${board}";
+        kernel = config.system.build.kernel;
         populate-kernel =
           if cfg.uboot.enable
           then ''