Merge pull request #87856 from eadwu/kernel/same-kernel
nixos/kernel.nix: ensure same kernel is used
This commit is contained in:
commit
8468a9878c
|
@ -37,12 +37,10 @@ in
|
||||||
boot.kernelPackages = mkOption {
|
boot.kernelPackages = mkOption {
|
||||||
default = pkgs.linuxPackages;
|
default = pkgs.linuxPackages;
|
||||||
type = types.unspecified // { merge = mergeEqualOption; };
|
type = types.unspecified // { merge = mergeEqualOption; };
|
||||||
apply = kernelPackages: kernelPackages.extend (self: super: {
|
apply = kernelPackages: pkgs.linuxPackagesFor (kernelPackages.kernel.override {
|
||||||
kernel = super.kernel.override {
|
inherit randstructSeed;
|
||||||
inherit randstructSeed;
|
kernelPatches = kernelPackages.kernel.kernelPatches ++ kernelPatches;
|
||||||
kernelPatches = super.kernel.kernelPatches ++ kernelPatches;
|
features = lib.recursiveUpdate kernelPackages.kernel.features features;
|
||||||
features = lib.recursiveUpdate super.kernel.features features;
|
|
||||||
};
|
|
||||||
});
|
});
|
||||||
# We don't want to evaluate all of linuxPackages for the manual
|
# We don't want to evaluate all of linuxPackages for the manual
|
||||||
# - some of it might not even evaluate correctly.
|
# - some of it might not even evaluate correctly.
|
||||||
|
|
Loading…
Reference in a new issue