swap applyTemplate arguments

This commit is contained in:
jacekpoz 2024-09-13 11:02:03 +02:00
parent 90b56eac6e
commit 90856f19bf
Signed by: poz
SSH key fingerprint: SHA256:JyLeVWE4bF3tDnFeUpUaJsPsNlJyBldDGV/dIKSLyN8

View file

@ -29,7 +29,7 @@ pkgs: src: {extraArgs, entries, templates}: let
else else
_template; _template;
applyTemplate = entry: templateFile: let applyTemplate = templateFile: entry: let
templateFn = import templateFile; templateFn = import templateFile;
template = templateFn (args // entry); template = templateFn (args // entry);
in in
@ -41,7 +41,7 @@ pkgs: src: {extraArgs, entries, templates}: let
newEntry = template.output // {inherit (entry) file;}; newEntry = template.output // {inherit (entry) file;};
foundTemplateFile = findTemplateFile newEntry; foundTemplateFile = findTemplateFile newEntry;
in in
applyTemplate newEntry foundTemplateFile; applyTemplate foundTemplateFile newEntry;
replaceSuffix = from: to: string: replaceSuffix = from: to: string:
if !(hasSuffix from string) then if !(hasSuffix from string) then
@ -79,10 +79,10 @@ pkgs: src: {extraArgs, entries, templates}: let
entry; entry;
processEntryFile = entryFile: let processEntryFile = entryFile: let
entry = getEntry entryFile;
foundTemplateFile = findTemplateFile entry; foundTemplateFile = findTemplateFile entry;
entry = getEntry entryFile;
in in
applyTemplate entry foundTemplateFile; applyTemplate foundTemplateFile entry;
in /*sh*/'' in /*sh*/''
${concatMapStrings ${concatMapStrings