about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-08-28T09·29+0200
committerGitHub <noreply@github.com>2019-08-28T09·29+0200
commitbd285849ed1a902cb2d590b5124a310e8b18df8b (patch)
tree5515c86addda1f73d1883eaaef5055da902e096d
parent5fa8b3f96577db65e080aaef65ad1cae462356cc (diff)
parent0463d5e36ffdbb60f851bd3b34756eff84151b28 (diff)
Merge pull request #3054 from matthewbauer/nix-dir-macos
Allow empty /nix directory in multi-user installer
-rw-r--r--scripts/install-multi-user.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/install-multi-user.sh b/scripts/install-multi-user.sh
index 9b757e7da3f2..3d8b035eb7d1 100644
--- a/scripts/install-multi-user.sh
+++ b/scripts/install-multi-user.sh
@@ -330,7 +330,7 @@ EOF
         fi
     done
 
-    if [ -d /nix ]; then
+    if [ -d /nix/store ] || [ -d /nix/var ]; then
         failure <<EOF
 There are some relics of a previous installation of Nix at /nix, and
 this scripts assumes Nix is _not_ yet installed. Please delete the old