diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-25 17:06:09 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-25 17:06:09 -0400 |
| commit | 2605f4f4e6a367df67bf8b33b252c350313699c9 (patch) | |
| tree | 87a9368202cb763c130e95ca89b0a97e9c24cb04 | |
| parent | 477b0fbeca62bf1957bc0aad26f1a844ebd22231 (diff) | |
| download | guix-2605f4f4e6a367df67bf8b33b252c350313699c9.tar.gz | |
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.
| -rw-r--r-- | scripts/nix-profile.sh.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in index b18069d940..bc3dc719eb 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 |