aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-12-22 17:16:17 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-12-22 17:16:17 +0100
commit52120123a5505199c342afb42f1a48b9cb2628ed (patch)
treebcaf90a5aacff086d1f2eadba322a28826d39845
parent68fd01f42ad8d56c491c755db914cb8894965e9a (diff)
Handle /tmp being a symlink
Hopefully fixes Darwin sandbox regression introduced in 8063fc497ab78fa72962b93874fe25dcca2b55ed.
-rw-r--r--src/libstore/build.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 418956feb..0fd958846 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -1765,7 +1765,7 @@ void DerivationGoal::startBuilder()
/* In a sandbox, for determinism, always use the same temporary
directory. */
- tmpDirInSandbox = useChroot ? "/tmp/nix-build-" + drvName + "-0" : tmpDir;
+ tmpDirInSandbox = useChroot ? canonPath("/tmp", true) + "/nix-build-" + drvName + "-0" : tmpDir;
/* Add all bindings specified in the derivation via the
environments, except those listed in the passAsFile