OS X sandbox: Don't use a deterministic $TMPDIR
This doesn't work because the OS X sandbox cannot bind-mount path to a different location.
This commit is contained in:
		
							parent
							
								
									c740c3ce50
								
							
						
					
					
						commit
						44f3f8048f
					
				
					 1 changed files with 0 additions and 3 deletions
				
			
		| 
						 | 
					@ -1732,9 +1732,6 @@ void DerivationGoal::startBuilder()
 | 
				
			||||||
       directory. */
 | 
					       directory. */
 | 
				
			||||||
#if __linux__
 | 
					#if __linux__
 | 
				
			||||||
    tmpDirInSandbox = useChroot ? settings.sandboxBuildDir : tmpDir;
 | 
					    tmpDirInSandbox = useChroot ? settings.sandboxBuildDir : tmpDir;
 | 
				
			||||||
#elif __APPLE__
 | 
					 | 
				
			||||||
    // On Darwin, we canonize /tmp because its probably a symlink to /private/tmp.
 | 
					 | 
				
			||||||
    tmpDirInSandbox = useChroot ? canonPath("/tmp", true) + "/nix-build-" + drvName + "-0" : tmpDir;
 | 
					 | 
				
			||||||
#else
 | 
					#else
 | 
				
			||||||
    tmpDirInSandbox = tmpDir;
 | 
					    tmpDirInSandbox = tmpDir;
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue