diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-12-14 18:15:37 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-12-14 18:15:37 +0100 |
| commit | e1b7096acdd3dedbdca92a6d20ade94b21d8561d (patch) | |
| tree | fb72d4fb70e265033bd66793446c1af9f0cd969d /test-env.in | |
| parent | b3a53fb3610ff23b75f11d58325110d29451a726 (diff) | |
| download | patches-e1b7096acdd3dedbdca92a6d20ade94b21d8561d.tar patches-e1b7096acdd3dedbdca92a6d20ade94b21d8561d.tar.gz | |
daemon: Build `nix-setuid-helper'.
* daemon.am (libexec_PROGRAMS, nix_setuid_helper_SOURCES,
nix_setuid_helper_CPPFLAGS, nix_setuid_helper_LDADD): New variables.
* test-env.in: Set and export `NIX_SETUID_HELPER'.
* README (Installing Guix as non-root): New section.
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" |