pyrox.dev / nixpkgs
lol
fork atom

nixos-rebuild: Respect empty NIX_REMOTE

Fixes #11384.

Note: in Nix 1.12, you can set NIX_REMOTE to "local" to avoid
ambiguity.

Eelco Dolstra 70770318 6e4a343f

options
unified split
Changed files
+1 -1
nixos
modules
installer
tools
nixos-rebuild.sh
+1 -1
nixos/modules/installer/tools/nixos-rebuild.sh 
···

       
250

       
250

       
 

       
# If --repair is given, don't try to use the Nix daemon, because the


     

       
251

       
251

       
 

       
# flag can only be used directly.


     

       
252

       
252

       
 

       
if [ -z "$repair" ] && systemctl show nix-daemon.socket nix-daemon.service | grep -q ActiveState=active; then


     

       
253

       

       
-

       
    export NIX_REMOTE=${NIX_REMOTE:-daemon}


     

       

       
253

       
+

       
    export NIX_REMOTE=${NIX_REMOTE-daemon}


     

       
254

       
254

       
 

       
fi


     

       
255

       
255

       
 

       



     

       
256

       
256