From 2605f4f4e6a367df67bf8b33b252c350313699c9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 25 Jul 2012 17:06:09 -0400 Subject: [PATCH] nix-profile.sh: Don't set NIX_REMOTE on single user installations Commit 6a214f3e06fa1c5f0a4d40e555f14d87691af297 reused the NixOS environment initialisation for nix-profile.sh, but this is inappropriate on systems that don't have multi-user support enabled. --- scripts/nix-profile.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in index b18069d94..bc3dc719e 100644 --- a/scripts/nix-profile.sh.in +++ b/scripts/nix-profile.sh.in @@ -43,7 +43,7 @@ fi # Set up secure multi-user builds: non-root users build through the # Nix daemon. -if test "$USER" != root; then +if [ "$USER" != root -a -e @localstatedir@/nix/daemon-socket/socket ]; then export NIX_REMOTE=daemon else unset NIX_REMOTE