From 832dda5b59fb454e8d3e91ea9f75ae1b55f9a6b6 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Fri, 17 Mar 2023 14:56:03 +0100 Subject: [PATCH] guix: store builds in ./guix --- .gitignore | 2 +- contrib/guix/libexec/prelude.bash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ec59857f..a22af819 100644 --- 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 07b2bc78..9575edb6 100644 --- 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}}" -- 2.52.0