Merge pull request #262834 from amjoseph-nixpkgs/pr/linux/allow-to-omit-common-config

This commit is contained in:
Artturi 2023-11-03 06:33:41 +02:00 committed by GitHub
commit 3bc446a5fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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