From 8bf8d1091af819f98759ae7e83f44354030efed6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 13 Feb 2019 00:43:01 +0100 Subject: taalo-build: Allow to build multiple derivations If taalo-build is used on a Nix expression returning multiple derivations either by a list or an attribute set, nix-instantiate will return multiple paths. Quoting the argument to "nix-store -r" however will pass the newline- separated files returned by nix-instantiate as one big file name, which in turn causes the realize to fail. Removing those quotes doesn't have this problems and we also don't get into trouble because those paths are under our control and don't contain spaces or tabs (which would then be splitted by the shell). Signed-off-by: aszlig --- pkgs/taalo-build/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/taalo-build') diff --git a/pkgs/taalo-build/default.nix b/pkgs/taalo-build/default.nix index 700dfd1c..383b974f 100644 --- a/pkgs/taalo-build/default.nix +++ b/pkgs/taalo-build/default.nix @@ -23,7 +23,7 @@ in runCommand "taalo-build" {} '' gctmp="$(${lib.escapeShellArg "${coreutils}/bin/mktemp"} -d)" trap 'rm -rf "$gctmp"' EXIT drv="$(${mkNix "nix-instantiate"} --add-root "$gctmp/drv" --indirect "$@")" - '' + remoteRealize "" "\"$drv\"")} > "$out/bin/taalo-build" + '' + remoteRealize "" "$drv")} > "$out/bin/taalo-build" ${emitScript (remoteRealize "exec " "\"$@\"")} > "$out/bin/taalo-realize" -- cgit 1.4.1