on master help sign in
Configurable nixdir location
commit7f0418d5787e29783f9bf82b9c071dc3e032ea9b authorMatthew Bauer <mjbauer95@gmail.com> dateMon 21 Aug 2017, 09:22 (9 years ago) parentabc23a5
1 file changed+8−4
nix-bootstrap.sh+8−4
nix-bootstrap.sh+8−4
@@ -10,19 +10,23 @@ fi
1010proot=`dirname $0`/proot-`uname -p`
1111export PROOT_NO_SECCOMP=1
1212
13+nixdir=$HOME/.nix
14+
15+OLD_NIX_PATH=$NIX_PATH
1316if [ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]; then . $HOME/.nix-profile/etc/profile.d/nix.sh; fi
17+if ! [ -z "$OLD_NIX_PATH" ]; then NIX_PATH="$OLD_NIX_PATH"; fi
1418
1519if [ -z "$IN_PROOT" ]; then
1620 export IN_PROOT=1
1721
18− if ! [ -d $HOME/.nix ]; then
19− mkdir -p $HOME/.nix
22+ if ! [ -d $nixdir ]; then
23+ mkdir -p $nixdir
2024 s=$(mktemp)
2125 curl https://nixos.org/nix/install -o $s
22− $proot -b $HOME/.nix:/nix $0 sh $s
26+ $proot -b $nixdir:/nix $0 sh $s
2327 fi
2428
25− $proot -b $HOME/.nix:/nix $0 $cmd
29+ $proot -b $nixdir:/nix $0 $cmd
2630
2731 export IN_PROOT=
2832 exit