pass around the store path isntead of relying on a symlink to be present

bytes-zone · Aug 10, 2022 · 11faf69 · 11faf69
1 parent 68def00
commit 11faf69
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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"