aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-01-18 23:37:11 +0100
committerLudovic Courtès <ludo@gnu.org>2016-01-18 23:52:13 +0100
commitaac783cac54e48bb5d85d911bcad198fe3c9de04 (patch)
treebeccb1b719047d29cf860a32295c68ff0fcafe00
parent26da7c2606fa963932b7a9a876f77c1b7488446e (diff)
downloadpatches-aac783cac54e48bb5d85d911bcad198fe3c9de04.tar
patches-aac783cac54e48bb5d85d911bcad198fe3c9de04.tar.gz
build: Remove traces of 'NIX_SETUID_HELPER'.
This is a followup to 0919f5f4. * test-env.in: Remove occurrences of 'NIX_SETUID_HELPER'.
-rw-r--r--test-env.in11
1 files changed, 5 insertions, 6 deletions
diff --git a/test-env.in b/test-env.in
index d6389a1097..67f4f805fa 100644
--- a/test-env.in
+++ b/test-env.in
@@ -1,7 +1,7 @@
#!/bin/sh
# GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
#
# This file is part of GNU Guix.
#
@@ -31,7 +31,6 @@ unset CDPATH
if [ -x "@abs_top_builddir@/guix-daemon" ]
then
- NIX_SETUID_HELPER="@abs_top_builddir@/nix-setuid-helper" # normally unused
NIX_STORE_DIR="@GUIX_TEST_ROOT@/store"
# Do that because store.scm calls `canonicalize-path' on it.
@@ -87,10 +86,10 @@ then
# 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 \
+ export NIX_IGNORE_SYMLINK_STORE NIX_STORE_DIR \
+ NIX_LOCALSTATE_DIR NIX_LOG_DIR NIX_STATE_DIR NIX_DB_DIR \
+ NIX_ROOT_FINDER GUIX_BINARY_SUBSTITUTE_URL \
+ GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES \
NIX_CONF_DIR XDG_CACHE_HOME NIXPKGS
# Launch the daemon without chroot support because is may be