summary refs log tree commit diff
path: root/build-aux/test-env.in
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-10-16 19:09:46 +0200
committerLudovic Courtès <ludo@gnu.org>2019-10-16 22:53:40 +0200
commit47e99e626b46b2fc433506a822d251de68ad6241 (patch)
tree5c0b17db2138ae1db0ac82c55cd357479fa21ed5 /build-aux/test-env.in
parent65ecf3a7afcfcb96ec90dc0cabb6b2d1a1d54398 (diff)
downloadguix-47e99e626b46b2fc433506a822d251de68ad6241.tar.gz
daemon: Remove traces of 'NIX_ROOT_FINDER'.
This is a followup to 2e3e5d21988fc2cafb2a9eaf4b00976ea425629d.

* build-aux/test-env.in: Remove mentions of 'NIX_ROOT_FINDER'.
* nix/libstore/gc.cc (LocalStore::collectGarbage): Adjust comment
accordingly.
Diffstat (limited to 'build-aux/test-env.in')
-rw-r--r--build-aux/test-env.in3
1 files changed, 1 insertions, 2 deletions
diff --git a/build-aux/test-env.in b/build-aux/test-env.in
index b1470bb953..6b0f8daa87 100644
--- a/build-aux/test-env.in
+++ b/build-aux/test-env.in
@@ -53,7 +53,6 @@ then
     NIX_LOCALSTATE_DIR="@GUIX_TEST_ROOT@/var"
     GUIX_LOG_DIRECTORY="@GUIX_TEST_ROOT@/var/log/guix"
     GUIX_DATABASE_DIRECTORY="@GUIX_TEST_ROOT@/db"
-    NIX_ROOT_FINDER="@abs_top_builddir@/nix/scripts/list-runtime-roots"
 
     # Choose a PID-dependent name to allow for parallel builds.  Note
     # that the directory name must be chosen so that the socket's file
@@ -98,7 +97,7 @@ then
 
     export NIX_IGNORE_SYMLINK_STORE NIX_STORE_DIR		\
 	NIX_LOCALSTATE_DIR GUIX_LOG_DIRECTORY GUIX_STATE_DIRECTORY GUIX_DATABASE_DIRECTORY	\
-	NIX_ROOT_FINDER GUIX_BINARY_SUBSTITUTE_URL		\
+	GUIX_BINARY_SUBSTITUTE_URL				\
         GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES			\
         GUIX_CONFIGURATION_DIRECTORY XDG_CACHE_HOME NIXPKGS