diff options
author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2021-02-03 18:56:29 -0500 |
---|---|---|
committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-02-03 20:31:22 -0500 |
commit | f413b2bc51853aae5adc13933159350c1c1b082d (patch) | |
tree | aecf25cd04572a19aebd90dce682412ed6c51259 /nixos/modules | |
parent | fc9d4763b9383617d33e53d38486d562e83ac023 (diff) |
Revert "nixos/kernel.nix: ensure same kernel is used"
This reverts commit 78f915a0025a594b334bccd3a56023d5c6f8310c.
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/system/boot/kernel.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 9287852bacfda..ed7226331d70e 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -37,10 +37,12 @@ in boot.kernelPackages = mkOption { default = pkgs.linuxPackages; type = types.unspecified // { merge = mergeEqualOption; }; - apply = kernelPackages: pkgs.linuxPackagesFor (kernelPackages.kernel.override { - inherit randstructSeed; - kernelPatches = kernelPackages.kernel.kernelPatches ++ kernelPatches; - features = lib.recursiveUpdate kernelPackages.kernel.features features; + apply = kernelPackages: kernelPackages.extend (self: super: { + kernel = super.kernel.override { + inherit randstructSeed; + kernelPatches = super.kernel.kernelPatches ++ kernelPatches; + features = lib.recursiveUpdate super.kernel.features features; + }; }); # We don't want to evaluate all of linuxPackages for the manual # - some of it might not even evaluate correctly. |