alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases 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
parent 647671bc53 725a4d6740
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
# 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
# /tmp/root in the chroot is the root of the CD.
export NIX_OTHER_STORES=/tmp/root/nix:$NIX_OTHER_STORES