Merge pull request #82 from nix-community/kernel-override

only mention rpi-kernels when overriding kernel

Author: tstat

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;

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 ''