pyrox.dev / nixpkgs
lol
fork atom

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

Eelco Dolstra ab16b6a8 647671bc

options
unified split
Changed files
+3
nixos
modules
installer
tools
nixos-install.sh
+3
nixos/modules/installer/tools/nixos-install.sh 
···

       
188

       
188

       
 

       
ln -sf @shell@ $mountPoint/bin/sh


     

       
189

       
189

       
 

       



     

       
190

       
190

       
 

       



     

       

       
191

       
+

       
# Build hooks likely won't function correctly in the minimal chroot; just disable them.


     

       

       
192

       
+

       
unset NIX_BUILD_HOOK


     

       

       
193

       
+

       



     

       
191

       
194

       
 

       
# Make the build below copy paths from the CD if possible.  Note that


     

       
192

       
195

       
 

       
# /tmp/root in the chroot is the root of the CD.


     

       
193

       
196

       
 

       
export NIX_OTHER_STORES=/tmp/root/nix:$NIX_OTHER_STORES