diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-30 23:33:07 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-30 23:33:07 +0200 |
| commit | ab16b6a83719b779e5fbea9b594d1dd09b3bcd76 (patch) | |
| tree | aad6c0ade1e23325beea10ae8787378b86177e74 /nixos/modules/installer | |
| parent | 647671bc537d35923fdaa6f7c03385868635d615 (diff) | |
| parent | 725a4d67404f4cf204386e52646cf42ecab394b3 (diff) | |
| download | nixlib-ab16b6a83719b779e5fbea9b594d1dd09b3bcd76.tar nixlib-ab16b6a83719b779e5fbea9b594d1dd09b3bcd76.tar.gz nixlib-ab16b6a83719b779e5fbea9b594d1dd09b3bcd76.tar.bz2 nixlib-ab16b6a83719b779e5fbea9b594d1dd09b3bcd76.tar.lz nixlib-ab16b6a83719b779e5fbea9b594d1dd09b3bcd76.tar.xz nixlib-ab16b6a83719b779e5fbea9b594d1dd09b3bcd76.tar.zst nixlib-ab16b6a83719b779e5fbea9b594d1dd09b3bcd76.zip | |
Merge pull request #10160 from dezgeg/pr-unset-build-hook-in-nixos-install
nixos-install: Don't use NIX_BUILD_HOOK from caller's environment
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-install.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index f7fe6245d6d9..4e10615f902f 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -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 |