guix: store builds in ./guix

diff --git a/.gitignore b/.gitignore
index ec59857f3c5981d5d45f2a3b84046d0fac37f1f8..a22af819ddbf61b65eab4c05bc861906956c4229 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,6 @@ src/assets_tor.qrc
 feather.AppDir/*
 src/assets/tor/*
 !src/assets/tor/.gitkeep
-guix-build-*
 contrib/installers/windows/setup.nsi
 githash.txt
+guix/guix-build-*

diff --git a/contrib/guix/libexec/prelude.bash b/contrib/guix/libexec/prelude.bash
index 07b2bc78e5de04b6753b10834bb22b40f2b79c2f..9575edb660de376348b362994eead08193e73feb 100644 (file)
--- a/contrib/guix/libexec/prelude.bash
+++ b/contrib/guix/libexec/prelude.bash
@@ -69,7 +69,7 @@ VERSION="${FORCE_VERSION:-$(git_head_version)}"
 DISTNAME="${DISTNAME:-feather-${VERSION}}"
 
 VERSION_BASE_DIR="${VERSION_BASE_DIR:-${PWD}}"
-version_base_prefix="${VERSION_BASE_DIR}/guix-build-"
+version_base_prefix="${VERSION_BASE_DIR}/guix/guix-build-"
 VERSION_BASE="${version_base_prefix}${VERSION}"  # TOP
 
 DISTSRC_BASE="${DISTSRC_BASE:-${VERSION_BASE}}"