From f413b2bc51853aae5adc13933159350c1c1b082d Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Wed, 3 Feb 2021 18:56:29 -0500 Subject: Revert "nixos/kernel.nix: ensure same kernel is used" This reverts commit 78f915a0025a594b334bccd3a56023d5c6f8310c. --- nixos/modules/system/boot/kernel.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'nixos/modules') 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. -- cgit 1.4.1