nix/11.stylix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

stylix/mk-target: rename mkConfig function to callModule

Browse source 
Rename the mkConfig function to callModule to generalize the name beyond
the specific config and options module arguments.

Fixes: dea0337e0b ("stylix: restrict access to config while using mkTarget (#1368)")
(cherry picked from commit 1272e6858e)
This commit is contained in:
NAHO 2025-11-21 20:12:08 +01:00 • committed by 0xda157
parent 4ec8181cd8
commit 66576c1e09
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
stylix/mk-target.nix
View file

@ -217,7 +217,7 @@ let
);
# Call the configuration function with its required Stylix arguments.
mkConfig = fn: fn (getStylixAttrs fn);
callModule = fn: fn (getStylixAttrs fn);
# Safeguard configuration functions when any of their arguments is
# disabled.
@ -232,13 +232,13 @@ let
(builtins.all (attr: attr.enable or (attr != null)))
];
in
lib.mkIf allAttrsEnabled (mkConfig c)
lib.mkIf allAttrsEnabled (callModule c)
else
c;
in
{
imports = imports ++ [
{ options.stylix.targets.${name} = mkConfig (lib.toFunction extraOptions); }
{ options.stylix.targets.${name} = callModule (lib.toFunction extraOptions); }
];
options.stylix.targets.${name}.enable =
@ -258,7 +258,7 @@ let
config = lib.mkIf (config.stylix.enable && cfg.enable) (
lib.mkMerge (
lib.optional (generalConfig != null) (
mkConfig (
callModule (
if builtins.isPath generalConfig then import generalConfig else generalConfig
)
)