diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-12-22 17:16:17 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-05-31 14:25:28 +0200 |
| commit | e08380fb6cefd3fd67c3c220a3ddaf385e6413cf (patch) | |
| tree | 303a83a6816024a32035de423532fd92eb8ac9c4 | |
| parent | 8fe5d95e6653a8ca2f40048b71bb596c80bb264f (diff) | |
| download | patches-e08380fb6cefd3fd67c3c220a3ddaf385e6413cf.tar patches-e08380fb6cefd3fd67c3c220a3ddaf385e6413cf.tar.gz | |
daemon: Handle /tmp being a symlink.
* nix/libstore/build.cc (DerivationGoal::startBuilder): Call 'canonPath'
on "/tmp".
| -rw-r--r-- | nix/libstore/build.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc index f9fd61adde..f0f60d7df1 100644 --- a/nix/libstore/build.cc +++ b/nix/libstore/build.cc @@ -1717,7 +1717,7 @@ void DerivationGoal::startBuilder() /* In a sandbox, for determinism, always use the same temporary directory. */ - tmpDirInSandbox = useChroot ? "/tmp/guix-build-" + drvName + "-0" : tmpDir; + tmpDirInSandbox = useChroot ? canonPath("/tmp/guix-build-", true) + drvName + "-0" : tmpDir; /* For convenience, set an environment pointing to the top build directory. */ |