diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-03 06:01:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-03 06:01:08 +0000 |
| commit | 41ef1f3277e06938c8e265052e69c894860cde16 (patch) | |
| tree | 00974a5e05dbe14a30c43606ab66ac7bb9d0356d /pkgs/os-specific/linux/kernel/generic.nix | |
| parent | cbec6b85a3ad3071e1fc2d7057671f73c59e2138 (diff) | |
| parent | 014ba34da35c14b6cad82b07a1245f3251e78645 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux/kernel/generic.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index c32b06bc27c85..df67005dd8165 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -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 ? {} @@ -181,7 +185,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 |