diff options
| author | Profpatsch <mail@profpatsch.de> | 2018-09-22 23:09:03 +0200 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2018-09-22 23:16:15 +0200 |
| commit | 0cfe277878425794df5804b71d828161f5a95b43 (patch) | |
| tree | e8e64cf6039c5c98eb096a1d9fc6be01adbf0b81 /pkgs/profpatsch/execline/run-execline.nix | |
| parent | 5dcf14e5cd3ac05767326522f64abdffbf26074e (diff) | |
pkgs.profpatsch: switch to different import scheme
Reference files in `bin` outputs for a derivation as an attribute set, with renaming capabilities.
Diffstat (limited to 'pkgs/profpatsch/execline/run-execline.nix')
| -rw-r--r-- | pkgs/profpatsch/execline/run-execline.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/profpatsch/execline/run-execline.nix b/pkgs/profpatsch/execline/run-execline.nix index 61c8c2e6..dbc6f4fd 100644 --- a/pkgs/profpatsch/execline/run-execline.nix +++ b/pkgs/profpatsch/execline/run-execline.nix @@ -1,4 +1,4 @@ -{ stdenv, importasCommand, execCommand, redirfdCommand, execlinebCommand }: +{ stdenv, bin }: { name # the execline script as string , execline @@ -6,7 +6,7 @@ , stdin ? "" # a program wrapping the acutal execline invocation; # should be in Bernstein-chaining style -, builderWrapper ? execCommand +, builderWrapper ? bin.exec # additional arguments to pass to the derivation , derivationArgs ? {} }: @@ -37,23 +37,23 @@ derivation (derivationArgs // { builder = builderWrapper; args = [ - importasCommand # import script file as $script + bin.importas # import script file as $script "-ui" # drop the envvar afterwards "script" # substitution name "_runExeclineScriptPath" # passed script file # TODO: can we scrap stdin via builderWrapper? - importasCommand # do the same for $stdin + bin.importas # do the same for $stdin "-ui" "stdin" "_runExeclineStdinPath" - redirfdCommand # now we + bin.redirfd # now we "-r" # read the file "0" # into the stdin of execlineb "$stdin" # that was given via stdin - execlinebCommand # the actual invocation + bin.execlineb # the actual invocation # TODO: depending on the use-case, -S0 might not be enough # in all use-cases, then a wrapper for execlineb arguments # should be added (-P, -S, -s). |