From 0cfe277878425794df5804b71d828161f5a95b43 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 22 Sep 2018 23:09:03 +0200 Subject: pkgs.profpatsch: switch to different import scheme Reference files in `bin` outputs for a derivation as an attribute set, with renaming capabilities. --- pkgs/profpatsch/testing/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/profpatsch/testing') diff --git a/pkgs/profpatsch/testing/default.nix b/pkgs/profpatsch/testing/default.nix index 55a141d9..21f814e4 100644 --- a/pkgs/profpatsch/testing/default.nix +++ b/pkgs/profpatsch/testing/default.nix @@ -1,5 +1,5 @@ { stdenv, runCommand, lib -, runExecline, s6TouchCommand, s6EchoCommand }: +, runExecline, bin }: let @@ -13,7 +13,7 @@ let /* TODO DOCS */ drvSeqL = drvDeps: drvOut: let - drvOutOutputs = drvOut.outputs or ["out"]; + drvOutOutputs = drvOut.outputs or ["out"]; in runCommand drvOut.name { # we inherit all attributes in order to replicate @@ -76,10 +76,10 @@ let # importas -i out out # ifte # # if $@ succeeds, $out is touched - # { ${s6TouchCommand} $out } + # { ${bin.s6-touch} $out } # # otherwise we return the exit code # { importas exit ? - # ${s6EchoCommand} $exit } + # ${bin.s6-echo} $exit } # # condition # $@ # ''; -- cgit 1.4.1