Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makeScriptWriter: forward check parameter to writeOut

Browse Source
This commit is contained in:
tv 2017-08-01 10:57:36 +02:00
parent 67def2c04a
commit bcc1a72d6a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
krebs/5pkgs/writers.nix
View File

@ -29,10 +29,11 @@ with import <stockholm/lib>;
execveBin = name: cfg: execveBin = name: cfg:
pkgs.execve name (cfg // { destination = "/bin/${name}"; }); pkgs.execve name (cfg // { destination = "/bin/${name}"; });
makeScriptWriter = interpreter: name: text: makeScriptWriter = { interpreter, check ? null }: name: text:
assert (with types; either absolute-pathname filename).check name; assert (with types; either absolute-pathname filename).check name;
pkgs.writeOut (baseNameOf name) { pkgs.writeOut (baseNameOf name) {
${optionalString (types.absolute-pathname.check name) name} = { ${optionalString (types.absolute-pathname.check name) name} = {
inherit check;
executable = true; executable = true;
text = "#! ${interpreter}\n${text}"; text = "#! ${interpreter}\n${text}";
}; };
@ -69,7 +70,9 @@ with import <stockholm/lib>;
strip --strip-unneeded "$exe" strip --strip-unneeded "$exe"
''; '';
writeDash = pkgs.makeScriptWriter "${pkgs.dash}/bin/dash"; writeDash = pkgs.makeScriptWriter {
interpreter = "${pkgs.dash}/bin/dash";
};
writeDashBin = name: writeDashBin = name:
assert types.filename.check name; assert types.filename.check name;
@ -305,5 +308,7 @@ with import <stockholm/lib>;
}; };
}; };
writeSed = pkgs.makeScriptWriter "${pkgs.gnused}/bin/sed -f"; writeSed = pkgs.makeScriptWriter {
interpreter = "${pkgs.gnused}/bin/sed -f";
};
} }