Merge pull request #3054 from matthewbauer/nix-dir-macos

Allow empty /nix directory in multi-user installer
This commit is contained in:
Eelco Dolstra 2019-08-28 11:29:43 +02:00 committed by GitHub
commit bd285849ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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