From fba5c2469bd5e95857c4ffd9db3dd0529f2485f3 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 4 Jun 2016 17:25:43 +0200
Subject: programs/taalo-build: Add link to derivation file

This is needed to ensure that the .drv file doesn't get garbage
collected while we're transferring it to taalo.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/user/aszlig/programs/taalo-build/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'modules/user/aszlig/programs/taalo-build/default.nix')

diff --git a/modules/user/aszlig/programs/taalo-build/default.nix b/modules/user/aszlig/programs/taalo-build/default.nix
index 93523660..71825610 100644
--- a/modules/user/aszlig/programs/taalo-build/default.nix
+++ b/modules/user/aszlig/programs/taalo-build/default.nix
@@ -61,8 +61,16 @@ let
 
   taalo-build = pkgs.writeScriptBin "taalo-build" ''
     #!${pkgs.stdenv.shell}
-    drvs="$(nix-instantiate "$@" | cut -d'!' -f1)" || exit 1
-    exec ${backend} $drvs
+    if tmpdir="$("${pkgs.coreutils}/bin/mktemp" -d taalo-build.XXXXXX)"; then
+      trap "rm -rf '$tmpdir'" EXIT
+      drvs="$(nix-instantiate --add-root "$tmpdir/derivation" --indirect "$@" \
+        | cut -d'!' -f1)" || exit 1
+      ${backend} $drvs
+      exit $?
+    else
+      echo "Unable to create temporary directory for build link!" >&2
+      exit 1
+    fi
   '';
 
 in {
-- 
cgit 1.4.1