Remove $NIX_BUILD_HOOK and $NIX_CURRENT_LOAD
This is to simplify remote build configuration. These environment variables predate nix.conf. The build hook now has a sensible default (namely build-remote). The current load is kept in the Nix state directory now.
This commit is contained in:
		
							parent
							
								
									ca9f589a93
								
							
						
					
					
						commit
						d7653dfc6d
					
				
					 6 changed files with 12 additions and 156 deletions
				
			
		| 
						 | 
				
			
			@ -140,7 +140,9 @@ int main (int argc, char * * argv)
 | 
			
		|||
        settings.buildTimeout = std::stoll(argv[3]);
 | 
			
		||||
        verbosity = (Verbosity) std::stoll(argv[4]);
 | 
			
		||||
 | 
			
		||||
        currentLoad = getEnv("NIX_CURRENT_LOAD", "/run/nix/current-load");
 | 
			
		||||
        /* It would be more appropriate to use $XDG_RUNTIME_DIR, since
 | 
			
		||||
           that gets cleared on reboot, but it wouldn't work on OS X. */
 | 
			
		||||
        currentLoad = settings.nixStateDir + "/current-load";
 | 
			
		||||
 | 
			
		||||
        std::shared_ptr<Store> sshStore;
 | 
			
		||||
        AutoCloseFD bestSlotLock;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue