move getEntry to extraArgs instead of making the user add it

This commit is contained in:
jacekpoz 2024-05-25 17:25:15 +02:00
parent b9dfa1bd7e
commit d31fd244af
Signed by: poz
SSH key fingerprint: SHA256:JyLeVWE4bF3tDnFeUpUaJsPsNlJyBldDGV/dIKSLyN8
2 changed files with 11 additions and 18 deletions

View file

@ -8,7 +8,7 @@ pkgs: src: {extraArgs, entries, templates}: let
inherit (lib.strings) concatMapStrings concatStrings escapeShellArg hasSuffix isString removeSuffix;
inherit (lib.trivial) functionArgs;
args = {inherit pkgs;}
args = {inherit pkgs getEntry;}
// (import ./stdlib.nix pkgs)
// extraArgs;
@ -84,10 +84,7 @@ pkgs: src: {extraArgs, entries, templates}: let
else
entry;
in {
inherit getEntry;
buildScript = /*sh*/''
in /*sh*/''
${concatMapStrings
(result: /*sh*/''
mkdir -p $out/${dirOf result.file}
@ -95,5 +92,4 @@ in {
'')
(forEach entries processEntryFile)
}
'';
}
''

View file

@ -8,10 +8,7 @@
inherit (lib.lists) map;
inherit (lib.strings) replaceStrings toLower;
_nte = nte {inherit extraArgs entries templates;};
extraArgs = {
inherit (_nte) getEntry;
h = n: content: let
id = replaceStrings [" " ";"] ["-" "-"] (toLower content);
in /*html*/''
@ -43,7 +40,7 @@ in
buildPhase = /*sh*/''
runHook preBuild
${_nte.buildScript}
${nte {inherit extraArgs entries templates;}}
runHook postBuild
'';