diff options
author | aszlig <aszlig@redmoonstudios.org> | 2016-10-13 00:04:51 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2016-10-13 00:11:26 +0200 |
commit | 0813752a1ff02721e9aeb0843249061a479161a1 (patch) | |
tree | 36b65c2ecd1cb17647d9cef5bc9947fd57201469 /modules/user/aszlig | |
parent | a12831c452c575d29dcf160f2ece039607a9c06c (diff) |
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>
Diffstat (limited to 'modules/user/aszlig')
-rw-r--r-- | modules/user/aszlig/system/kernel.nix | 11 |
1 files changed, 3 insertions, 8 deletions
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); }; }; } |