From 0813752a1ff02721e9aeb0843249061a479161a1 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 13 Oct 2016 00:04:51 +0200
Subject: kernel: Switch to use boot.kernelPatches

Since NixOS/nixpkgs@da36847d925058fd86f027b64cc712c57be11ad8 we no
longer need so much cruft to specify kernel patches, so let's switch to
boot.kernelPatches instead of the hackery we had so far.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/user/aszlig/system/kernel.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'modules/user/aszlig')

diff --git a/modules/user/aszlig/system/kernel.nix b/modules/user/aszlig/system/kernel.nix
index c51abba5..120a6c08 100644
--- a/modules/user/aszlig/system/kernel.nix
+++ b/modules/user/aszlig/system/kernel.nix
@@ -41,17 +41,12 @@ in {
   };
 
   config = mkIf cfg.enable {
-    boot = let
-      linuxVuizvui = pkgs.buildLinux {
+    boot = {
+      kernelPatches = singleton pkgs.vuizvui.kernelPatches.bfqsched;
+      kernelPackages = pkgs.linuxPackages_custom {
         inherit (mainlineKernel) version src;
-
-        kernelPatches = singleton pkgs.vuizvui.kernelPatches.bfqsched;
         configfile = generateKConf cfg.config;
-        allowImportFromDerivation = true;
       };
-    in rec {
-      kernelPackages = pkgs.recurseIntoAttrs
-        (pkgs.linuxPackagesFor linuxVuizvui kernelPackages);
     };
   };
 }
-- 
cgit 1.4.1