public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #54977 from teto/kernel_fix

Browse Source 
linux: (re)take into account extraConfig
This commit is contained in:
Joachim F
2019-01-31 19:46:11 +00:00
committed by GitHub
parent f89f2478b8 a5a796222b
commit bc84a22989
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/kernel/generic.nix
+4 -4
View File
@@ -73,10 +73,10 @@ let
features = kernelFeatures; # Ensure we know of all extra patches, etc. features = kernelFeatures; # Ensure we know of all extra patches, etc.
}; };
# extra config in legacy string format intermediateNixConfig = configfile.moduleStructuredConfig.intermediateNixConfig
extraConfig = extraConfig + lib.optionalString (stdenv.hostPlatform.platform ? kernelExtraConfig) stdenv.hostPlatform.platform.kernelExtraConfig; # extra config in legacy string format
+ extraConfig
intermediateNixConfig = configfile.moduleStructuredConfig.intermediateNixConfig; + lib.optionalString (stdenv.hostPlatform.platform ? kernelExtraConfig) stdenv.hostPlatform.platform.kernelExtraConfig;
structuredConfigFromPatches = structuredConfigFromPatches =
map ({extraStructuredConfig ? {}, ...}: {settings=extraStructuredConfig;}) kernelPatches; map ({extraStructuredConfig ? {}, ...}: {settings=extraStructuredConfig;}) kernelPatches;