diff options
author | Ludovic Courtès <ludo@gnu.org> | 2012-12-15 15:28:50 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2012-12-15 15:28:50 +0100 |
commit | a784c3077e7cdae5d8492aa540b86b8d32c9a696 (patch) | |
tree | 9a09f9a1b2f032b09f2314cf12f7965877290eaf /test-env.in | |
parent | 7f131cf3681afe62c84db66e48430de9e54e7d7d (diff) | |
parent | 07ab4bf1fc590642307f18b4d1b8687dde3d664b (diff) | |
download | guix-patches-a784c3077e7cdae5d8492aa540b86b8d32c9a696.tar guix-patches-a784c3077e7cdae5d8492aa540b86b8d32c9a696.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
distro/packages/multiprecision.scm
Diffstat (limited to 'test-env.in')
-rw-r--r-- | test-env.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test-env.in b/test-env.in index 4e388053f9..afcf3afedc 100644 --- a/test-env.in +++ b/test-env.in @@ -27,6 +27,7 @@ if [ -x "@abs_top_builddir@/guix-daemon" ] then NIX_SUBSTITUTERS="" # don't resort to substituters + NIX_SETUID_HELPER="@abs_top_builddir@/nix-setuid-helper" # normally unused NIX_IGNORE_SYMLINK_STORE=1 # in case the store is a symlink NIX_STORE_DIR="@GUIX_TEST_ROOT@/store" NIX_LOCALSTATE_DIR="@GUIX_TEST_ROOT@/var" @@ -42,7 +43,7 @@ then export NIX_SUBSTITUTERS NIX_IGNORE_SYMLINK_STORE NIX_STORE_DIR \ NIX_LOCALSTATE_DIR NIX_LOG_DIR NIX_STATE_DIR NIX_DB_DIR \ - NIX_ROOT_FINDER + NIX_ROOT_FINDER NIX_SETUID_HELPER # Do that because store.scm calls `canonicalize-path' on it. mkdir -p "$NIX_STORE_DIR" |