reepca pushed a commit to branch guile-daemon
in repository guix.
commit e067ef69ba5ed32129d0993fd7108795f4c32807
Author: Caleb Ristvedt <[email protected]>
Date: Mon Jun 5 22:34:59 2017 -0500
guix: register-path: use new %store-database-directory
* guix/config.scm.in (%store-database-directory): new variable.
* guix/store.scm (register-path): use variables from (guix config) instead
of
using environment variables directly.
* build-aux/test-env.in: Make sure canonicalize-path gets an existing path
from NIX_DB_DIR in tests.
---
build-aux/test-env.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/build-aux/test-env.in b/build-aux/test-env.in
index aaadcf2..372b0ff 100644
--- a/build-aux/test-env.in
+++ b/build-aux/test-env.in
@@ -53,6 +53,8 @@ then
NIX_LOCALSTATE_DIR="@GUIX_TEST_ROOT@/var"
NIX_LOG_DIR="@GUIX_TEST_ROOT@/var/log/guix"
NIX_DB_DIR="@GUIX_TEST_ROOT@/db"
+ # same problem as above, for %store-database-directory.
+ mkdir -p "$NIX_DB_DIR"
NIX_ROOT_FINDER="@abs_top_builddir@/nix/scripts/list-runtime-roots"
# Choose a PID-dependent name to allow for parallel builds. Note
