diff options
author | Adam Joseph <adam@westernsemico.com> | 2023-04-30 23:25:46 -0700 |
---|---|---|
committer | Adam Joseph <adam@westernsemico.com> | 2023-10-22 16:52:31 -0700 |
commit | 673605c4e4223b68709dc8603675c0e651c93c3a (patch) | |
tree | e8543fc9344ca61e7bd43cd8ae38ae9118be1409 /pkgs/os-specific | |
parent | 3d7a169afe725339aeb7e24b8407fd8a7a013316 (diff) |
linux: allow to omit the common-config.nix
Diffstat (limited to 'pkgs/os-specific')
-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 a21890a38ca20..74c47db625618 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 ? {} @@ -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 |