diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-10-18 18:10:47 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-10-18 18:10:47 +0200 |
| commit | b95d1b3289a6bb8e346a47e750660e16fb201c57 (patch) | |
| tree | cd4d956436f21d77645fd795d3e9737e4892c1d3 /build-aux/test-env.in | |
| parent | a1d1703a1dc6bfcd10f48fe707ee7ac65300a37d (diff) | |
| parent | dabcfc6de29032ea52d1cb54163a783f7e480167 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'build-aux/test-env.in')
| -rw-r--r-- | build-aux/test-env.in | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/build-aux/test-env.in b/build-aux/test-env.in index b1470bb953..59ab58cc94 100644 --- a/build-aux/test-env.in +++ b/build-aux/test-env.in @@ -50,10 +50,8 @@ then # it or its parent directories. See <http://bugs.gnu.org/17935>. NIX_STORE_DIR="`cd "@GUIX_TEST_ROOT@/store"; pwd -P`" - 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 @@ -97,8 +95,8 @@ then NIXPKGS="@NIXPKGS@" 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_LOG_DIRECTORY GUIX_STATE_DIRECTORY GUIX_DATABASE_DIRECTORY \ + GUIX_BINARY_SUBSTITUTE_URL \ GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES \ GUIX_CONFIGURATION_DIRECTORY XDG_CACHE_HOME NIXPKGS |