talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

linux: parse configfile at eval-time if possible

Browse Source 
Users might call `manualConfig` with a path presented at evaluation
time, in which case they shouldn't need to set `allowImportFromDerivation`
to true, since IFD wouldn't be needed.
This commit is contained in:
Jared Baur 2025-08-17 19:01:27 -07:00
parent 294574264e
commit 35956ce40e
No known key found for this signature in database
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -32,16 +32,24 @@ let
readConfig = readConfig =
configfile: configfile:
import lib.listToAttrs (
(runCommand "config.nix" { } '' map
echo "{" > "$out" (
while IFS='=' read key val; do line:
[ "x''${key#CONFIG_}" != "x$key" ] || continue let
no_firstquote="''${val#\"}"; match = lib.match "(.*)=\"?(.*)\"?" line;
echo ' "'"$key"'" = "'"''${no_firstquote%\"}"'";' >> "$out" in
done < "${configfile}" {
echo "}" >> $out name = lib.elemAt match 0;
'').outPath; value = lib.elemAt match 1;
}
)
(
lib.filter (line: !(lib.hasPrefix "#" line || line == "")) (
lib.splitString "\n" (builtins.readFile configfile)
)
)
);
in in
lib.makeOverridable ( lib.makeOverridable (
{ {
@ -64,7 +72,9 @@ lib.makeOverridable (
configfile, configfile,
# Manually specified nixexpr representing the config # Manually specified nixexpr representing the config
# If unspecified, this will be autodetected from the .config # If unspecified, this will be autodetected from the .config
config ? lib.optionalAttrs allowImportFromDerivation (readConfig configfile), config ? lib.optionalAttrs (builtins.isPath configfile || allowImportFromDerivation) (
readConfig configfile
),
# Custom seed used for CONFIG_GCC_PLUGIN_RANDSTRUCT if enabled. This is # Custom seed used for CONFIG_GCC_PLUGIN_RANDSTRUCT if enabled. This is
# automatically extended with extra per-version and per-config values. # automatically extended with extra per-version and per-config values.
randstructSeed ? "", randstructSeed ? "",