diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2019-01-31 13:34:42 +0900 |
|---|---|---|
| committer | Matthieu Coudron <mattator@gmail.com> | 2019-01-31 13:34:42 +0900 |
| commit | a5a796222bdc47d03b2af92e930fd9849d9d1fd9 (patch) | |
| tree | b813126d612f936f6848a30b8eb3bd2fc31aba09 /pkgs/os-specific/linux/kernel/generic.nix | |
| parent | b61797baf3d9bf41c3f0767e809fc97157b1624e (diff) | |
| download | nixpkgs-a5a796222bdc47d03b2af92e930fd9849d9d1fd9.tar nixpkgs-a5a796222bdc47d03b2af92e930fd9849d9d1fd9.tar.gz nixpkgs-a5a796222bdc47d03b2af92e930fd9849d9d1fd9.tar.bz2 nixpkgs-a5a796222bdc47d03b2af92e930fd9849d9d1fd9.tar.lz nixpkgs-a5a796222bdc47d03b2af92e930fd9849d9d1fd9.tar.xz nixpkgs-a5a796222bdc47d03b2af92e930fd9849d9d1fd9.tar.zst nixpkgs-a5a796222bdc47d03b2af92e930fd9849d9d1fd9.zip | |
linux: (re)take into account extraConfig
PR #42838 wrongly started to ignore extraConfig. This fixes that.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/generic.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 8 |
1 files 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; |