01/09: daemon: Handle /tmp being a symlink.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit e08380fb6cefd3fd67c3c220a3ddaf385e6413cf
Author: Eelco Dolstra <address@hidden>
Date:   Tue Dec 22 17:16:17 2015 +0100

    daemon: Handle /tmp being a symlink.
    
    * nix/libstore/build.cc (DerivationGoal::startBuilder): Call 'canonPath'
    on "/tmp".
---
 nix/libstore/build.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index f9fd61a..f0f60d7 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. */