diff options
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 8ff92ac1a0a..816a1363921 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -44,14 +44,12 @@ let netfilterRPFilter = true; } // features) kernelPatches; - configWithPlatform = kernelPlatform: import ./common-config.nix { - inherit stdenv version kernelPlatform extraConfig; + config = import ./common-config.nix { + inherit stdenv version extraConfig; + kernelPlatform = hostPlatform; features = kernelFeatures; # Ensure we know of all extra patches, etc. }; - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform hostPlatform.platform; - kernelConfigFun = baseConfig: let configFromPatches = @@ -75,12 +73,6 @@ let preferBuiltin = hostPlatform.platform.kernelPreferBuiltin or false; arch = hostPlatform.platform.kernelArch; - crossAttrs = let - cp = hostPlatform.platform; - in { - ignoreConfigErrors = true; - }; - prePatch = kernel.prePatch + '' # Patch kconfig to print "###" after every question so that # generate-config.pl from the generic builder can answer them. @@ -108,9 +100,7 @@ let }; kernel = buildLinux { - inherit version modDirVersion src kernelPatches stdenv extraMeta; - - configfile = configfile.nativeDrv or configfile; + inherit version modDirVersion src kernelPatches stdenv extraMeta configfile; config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; }; }; |