about summary refs log tree commit diff
path: root/modules
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-07-04 12:34:05 +0200
committeraszlig <aszlig@redmoonstudios.org>2016-07-04 12:36:16 +0200
commit6d2e8976d8fefbafa91638ab0b43aa4a93c4c0d9 (patch)
treeca3156704a5cf6915baee63590e7a293aa149ff6 /modules
parentf0003b92674a1f4555dd14ffa271622a3889cd84 (diff)
taalo-build: Set pipefail for nix-instantiate
If the nix-instantiate step in taalo-build should fail, we want it to
fail altogether rather than just going on and bailing out very late
(with an exit status of 0) when the readlink call fails.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules')
-rw-r--r--modules/user/aszlig/programs/taalo-build/default.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/user/aszlig/programs/taalo-build/default.nix b/modules/user/aszlig/programs/taalo-build/default.nix
index 3e89436a..55356e9f 100644
--- a/modules/user/aszlig/programs/taalo-build/default.nix
+++ b/modules/user/aszlig/programs/taalo-build/default.nix
@@ -63,6 +63,7 @@ let
     #!${pkgs.stdenv.shell}
     if tmpdir="$("${pkgs.coreutils}/bin/mktemp" -d -t taalo-build.XXXXXX)"; then
       trap "rm -rf '$tmpdir'" EXIT
+      set -o pipefail
       drvs="$(nix-instantiate --add-root "$tmpdir/derivation" --indirect "$@" \
         | cut -d'!' -f1)" || exit 1
       ${backend} $("${pkgs.coreutils}/bin/readlink" $drvs)