mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-19 04:02:10 +00:00
Merge pull request #262834 from amjoseph-nixpkgs/pr/linux/allow-to-omit-common-config
This commit is contained in:
commit
3bc446a5fb
|
@ -25,6 +25,10 @@
|
|||
# Additional make flags passed to kbuild
|
||||
, extraMakeFlags ? []
|
||||
|
||||
, # enables the options in ./common-config.nix; if `false` then only
|
||||
# `structuredExtraConfig` is used
|
||||
enableCommonConfig ? true
|
||||
|
||||
, # kernel intermediate config overrides, as a set
|
||||
structuredExtraConfig ? {}
|
||||
|
||||
|
@ -183,7 +187,9 @@ let
|
|||
moduleStructuredConfig = (lib.evalModules {
|
||||
modules = [
|
||||
module
|
||||
] ++ lib.optionals enableCommonConfig [
|
||||
{ settings = commonStructuredConfig; _file = "pkgs/os-specific/linux/kernel/common-config.nix"; }
|
||||
] ++ [
|
||||
{ settings = structuredExtraConfig; _file = "structuredExtraConfig"; }
|
||||
]
|
||||
++ structuredConfigFromPatches
|
||||
|
|
Loading…
Reference in a new issue