diff options
| author | Artturi <Artturin@artturin.com> | 2023-11-03 06:33:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-03 06:33:41 +0200 |
| commit | 3bc446a5fb474df9a715666445ecc8902b089c4b (patch) | |
| tree | 2af36757d01d99024f08447b494639898db360eb /pkgs | |
| parent | 297a971a16ad5998b5c4d2e3361413e9358f1d2d (diff) | |
| parent | 673605c4e4223b68709dc8603675c0e651c93c3a (diff) | |
| download | nixlib-3bc446a5fb474df9a715666445ecc8902b089c4b.tar nixlib-3bc446a5fb474df9a715666445ecc8902b089c4b.tar.gz nixlib-3bc446a5fb474df9a715666445ecc8902b089c4b.tar.bz2 nixlib-3bc446a5fb474df9a715666445ecc8902b089c4b.tar.lz nixlib-3bc446a5fb474df9a715666445ecc8902b089c4b.tar.xz nixlib-3bc446a5fb474df9a715666445ecc8902b089c4b.tar.zst nixlib-3bc446a5fb474df9a715666445ecc8902b089c4b.zip | |
Merge pull request #262834 from amjoseph-nixpkgs/pr/linux/allow-to-omit-common-config
Diffstat (limited to 'pkgs')
| -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 a21890a38ca2..74c47db62561 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 |