public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10160 from dezgeg/pr-unset-build-hook-in-nixos-install

Browse Source 
nixos-install: Don't use NIX_BUILD_HOOK from caller's environment
This commit is contained in:
Eelco Dolstra 2015-09-30 23:33:07 +02:00
commit ab16b6a837
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/installer/tools/nixos-install.sh
View File

@ -188,6 +188,9 @@ mkdir -m 0755 -p $mountPoint/bin
ln -sf @shell@ $mountPoint/bin/sh ln -sf @shell@ $mountPoint/bin/sh
# Build hooks likely won't function correctly in the minimal chroot; just disable them.
unset NIX_BUILD_HOOK
# Make the build below copy paths from the CD if possible. Note that # Make the build below copy paths from the CD if possible. Note that
# /tmp/root in the chroot is the root of the CD. # /tmp/root in the chroot is the root of the CD.
export NIX_OTHER_STORES=/tmp/root/nix:$NIX_OTHER_STORES export NIX_OTHER_STORES=/tmp/root/nix:$NIX_OTHER_STORES