Makes kernel part of the device description.

bootimg.nix

@@ -7,7 +7,7 @@ in
 with pkgs;
 let
   device_config = import (./devices + ("/" + device_name)) {inherit pkgs lib;};
-  linux = pkgs."linux_${device_name}";
+  linux = device_config.kernel;
   kernel = "${linux}/Image.gz-dtb";
   dt = "${linux}/boot/dt.img";
 

devices/asus-z00t/default.nix

@@ -8,6 +8,8 @@ let
 in
 config // {
   name = config.pm_name;
+  kernel = pkgs.callPackage ./kernel { kernelPatches = pkgs.defaultKernelPatches; };
+
   stage-1 = {
     fb_modes = ./fb.modes;
     packages = with pkgs; [

overlay/overlay.nix

@@ -4,30 +4,29 @@ let
   callPackage = self.callPackage;
 in
   {
-   linux_asus-z00t = callPackage ./asus-z00t {
-     kernelPatches = with self.kernelPatches; [
-       bridge_stp_helper
-       p9_fixes
-       lguest_entry-linkage
-       packet_fix_race_condition_CVE_2016_8655
-       DCCP_double_free_vulnerability_CVE-2017-6074
-     ];
-   };
+    # Misc. tools.
+    # Keep sorted.
+    dtbTool = callPackage ./dtbtool { };
+    fbv = callPackage ./fbv { libpng = self.libpng12; };
+    mkbootimg = callPackage ./mkbootimg { };
+    msm-fb-refresher = callPackage ./msm-fb-refresher { };
+    ply-image = callPackage ./ply-image { };
 
-   # Misc. tools.
-   # Keep sorted.
-   dtbTool = callPackage ./dtbtool { };
-   fbv = callPackage ./fbv { libpng = self.libpng12; };
-   mkbootimg = callPackage ./mkbootimg { };
-   msm-fb-refresher = callPackage ./msm-fb-refresher { };
-   ply-image = callPackage ./ply-image { };
+    # Extra "libs"
+    mkExtraUtils = import ./lib/extra-utils.nix {
+      inherit (self)
+        runCommandCC
+        nukeReferences
+        glibc
+      ;
+    };
 
-   # Extra "libs"
-   mkExtraUtils = import ./lib/extra-utils.nix {
-     inherit (self)
-       runCommandCC
-       nukeReferences
-       glibc
-     ;
-   };
+    # Default set of kernel patches.
+    defaultKernelPatches = with self.kernelPatches; [
+      bridge_stp_helper
+      p9_fixes
+      lguest_entry-linkage
+      packet_fix_race_condition_CVE_2016_8655
+      DCCP_double_free_vulnerability_CVE-2017-6074
+    ];
  }