diff options
author | Mark H Weaver <mhw@netris.org> | 2015-10-07 23:55:17 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2015-10-07 23:55:17 -0400 |
commit | 319fe79dd01e03c4ef61311c336bcd77e1133f02 (patch) | |
tree | c169d85b429a801fdc22ce27c25b7e4230eb320a /test-env.in | |
parent | 9511de1ef8c59788f2c93ae6b0cb1e87e30824ab (diff) | |
parent | a606ed89d4e3737beec2f3392bedba61904778f4 (diff) | |
download | guix-319fe79dd01e03c4ef61311c336bcd77e1133f02.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'test-env.in')
-rw-r--r-- | test-env.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test-env.in b/test-env.in index a7f506ec19..d6389a1097 100644 --- a/test-env.in +++ b/test-env.in @@ -84,11 +84,14 @@ then # Place for the substituter's cache. XDG_CACHE_HOME="$NIX_STATE_DIR/cache-$$" + # For the (guix import snix) tests. + NIXPKGS="@NIXPKGS@" + export NIX_IGNORE_SYMLINK_STORE NIX_STORE_DIR \ NIX_LOCALSTATE_DIR NIX_LOG_DIR NIX_STATE_DIR NIX_DB_DIR \ NIX_ROOT_FINDER NIX_SETUID_HELPER GUIX_BINARY_SUBSTITUTE_URL \ GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES \ - NIX_CONF_DIR XDG_CACHE_HOME + NIX_CONF_DIR XDG_CACHE_HOME NIXPKGS # Launch the daemon without chroot support because is may be # unavailable, for instance if we're not running as root. |