From 11faf69f492fe8fd9444890939bdb93732ed4ea6 Mon Sep 17 00:00:00 2001
From: Brian Hicks <brian@brianthicks.com>
Date: Wed, 10 Aug 2022 09:30:04 -0500
Subject: [PATCH] pass around the store path isntead of relying on a symlink to
 be present

---
 build-and-deploy.sh | 4 ++--
 build.sh            | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/build-and-deploy.sh b/build-and-deploy.sh
index f41b9cb..9a65ea8 100755
--- a/build-and-deploy.sh
+++ b/build-and-deploy.sh
@@ -10,5 +10,5 @@ if test -z "$BUILD_TARGET" || test -z "$DEPLOY_TARGET"; then
 fi
 
 set -x
-./build.sh "$BUILD_TARGET"
-./deploy.sh "$DEPLOY_TARGET" result
+STORE_PATH="$(./build.sh "$BUILD_TARGET")"
+./deploy.sh "$DEPLOY_TARGET" "$STORE_PATH"
diff --git a/build.sh b/build.sh
index d865967..9e16048 100755
--- a/build.sh
+++ b/build.sh
@@ -22,6 +22,5 @@ OUTPUT="$(
 
 OUT="$(jq -r '.[0]'.outputs.out <<< "$OUTPUT")"
 
-nix-copy-closure --from eu.nixbuild.net "$OUT"
-if test -h result; then rm result; fi
-ln -s "$OUT" result
+nix-copy-closure --use-substitutes --from eu.nixbuild.net "$OUT"
+echo "$OUT"