[PATCH] tests: Fix guix-home.sh when guix isn't installed

  • Done
  • quality assurance status badge
Details
2 participants
  • Ting-Wei Lan
  • Ludovic Courtès
Owner
unassigned
Submitted by
Ting-Wei Lan
Severity
normal
T
T
Ting-Wei Lan wrote on 18 Mar 2023 15:54
(address . guix-patches@gnu.org)(name . Ting-Wei Lan)(address . lantw44@gmail.com)
20230318145454.89946-1-lantw44@gmail.com
* tests/guix-home.sh: Reorder NIX_STORE_DIR variable definition to
prevent guix from crashing due to missing /gnu/store.
---
tests/guix-home.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (18 lines)
diff --git a/tests/guix-home.sh b/tests/guix-home.sh
index 3151f66683..11b068ca43 100644
--- a/tests/guix-home.sh
+++ b/tests/guix-home.sh
@@ -36,8 +36,8 @@ container_supported ()
fi
}
-NIX_STORE_DIR="$(guile -c '(use-modules (guix config))(display %storedir)')"
localstatedir="$(guile -c '(use-modules (guix config))(display %localstatedir)')"
+NIX_STORE_DIR="$(guile -c '(use-modules (guix config))(display %storedir)')"
GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket"
export NIX_STORE_DIR GUIX_DAEMON_SOCKET

base-commit: 99114eb63895712d2d3e62c5a83e3a1540438f15
--
2.39.2
L
L
Ludovic Courtès wrote on 26 Mar 2023 23:26
(name . Ting-Wei Lan)(address . lantw44@gmail.com)(address . 62259-done@debbugs.gnu.org)
87a5zzb3w9.fsf@gnu.org
Hi,

Ting-Wei Lan <lantw44@gmail.com> skribis:

Toggle quote (3 lines)
> * tests/guix-home.sh: Reorder NIX_STORE_DIR variable definition to
> prevent guix from crashing due to missing /gnu/store.

Applied, thanks!

Ludo’.
Closed
?