* Work properly if /root/.nix-defexpr/channels already exists.

svn path=/nixos/trunk/; revision=34233
This commit is contained in:
Eelco Dolstra 2012-05-24 23:37:06 +00:00
parent a6892051ef
commit b11770373a

View File

@ -162,7 +162,7 @@ mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles/per-user/root
chroot $mountPoint @nix@/bin/nix-env \ chroot $mountPoint @nix@/bin/nix-env \
-p /nix/var/nix/profiles/per-user/root/channels -i "$srcs" --quiet -p /nix/var/nix/profiles/per-user/root/channels -i "$srcs" --quiet
mkdir -m 0700 -p $mountPoint/root/.nix-defexpr mkdir -m 0700 -p $mountPoint/root/.nix-defexpr
ln -s /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels
# We're done building/downloading, so we don't need the /etc bind # We're done building/downloading, so we don't need the /etc bind