From a5a796222bdc47d03b2af92e930fd9849d9d1fd9 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 31 Jan 2019 13:34:42 +0900 Subject: [PATCH] linux: (re)take into account extraConfig PR #42838 wrongly started to ignore extraConfig. This fixes that. --- pkgs/os-specific/linux/kernel/generic.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index a41f1eb989b..df9a628f83d 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -73,10 +73,10 @@ let features = kernelFeatures; # Ensure we know of all extra patches, etc. }; - # extra config in legacy string format - extraConfig = extraConfig + lib.optionalString (stdenv.hostPlatform.platform ? kernelExtraConfig) stdenv.hostPlatform.platform.kernelExtraConfig; - - intermediateNixConfig = configfile.moduleStructuredConfig.intermediateNixConfig; + intermediateNixConfig = configfile.moduleStructuredConfig.intermediateNixConfig + # extra config in legacy string format + + extraConfig + + lib.optionalString (stdenv.hostPlatform.platform ? kernelExtraConfig) stdenv.hostPlatform.platform.kernelExtraConfig; structuredConfigFromPatches = map ({extraStructuredConfig ? {}, ...}: {settings=extraStructuredConfig;}) kernelPatches;