diff options
author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-01-30 22:13:02 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-30 22:13:02 -0500 |
commit | 8468a9878cefabeda552695f8ee9fac217c770b0 (patch) | |
tree | 9d5d17b9d1c3f8f4293cb52e47bcedc85b2cdc50 /nixos | |
parent | b81d40351b32f89d45632f98e5766b002d2e1ab8 (diff) | |
parent | 78f915a0025a594b334bccd3a56023d5c6f8310c (diff) |
Merge pull request #87856 from eadwu/kernel/same-kernel
nixos/kernel.nix: ensure same kernel is used
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/system/boot/kernel.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index ed7226331d70..9287852bacfd 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -37,12 +37,10 @@ in boot.kernelPackages = mkOption { default = pkgs.linuxPackages; type = types.unspecified // { merge = mergeEqualOption; }; - apply = kernelPackages: kernelPackages.extend (self: super: { - kernel = super.kernel.override { - inherit randstructSeed; - kernelPatches = super.kernel.kernelPatches ++ kernelPatches; - features = lib.recursiveUpdate super.kernel.features features; - }; + apply = kernelPackages: pkgs.linuxPackagesFor (kernelPackages.kernel.override { + inherit randstructSeed; + kernelPatches = kernelPackages.kernel.kernelPatches ++ kernelPatches; + features = lib.recursiveUpdate kernelPackages.kernel.features features; }); # We don't want to evaluate all of linuxPackages for the manual # - some of it might not even evaluate correctly. |