[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/04: daemon: Fix typo.
|
From: |
Ludovic Courtès |
|
Subject: |
03/04: daemon: Fix typo. |
|
Date: |
Tue, 31 May 2016 16:22:41 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit 4078fa8f72fd109882f8b5e918cb6f7a9c1ed535
Author: Ludovic Courtès <address@hidden>
Date: Tue May 31 17:47:07 2016 +0200
daemon: Fix typo.
Fixes a regression/typo introduced in
e08380fb6cefd3fd67c3c220a3ddaf385e6413cf.
* nix/libstore/build.cc (DerivationGoal::startBuilder): Canonicalize
"/tmp", not "/tmp/guix-build".
---
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 2d3960b..ae78e65 100644
--- a/nix/libstore/build.cc
+++ b/nix/libstore/build.cc
@@ -1718,7 +1718,7 @@ void DerivationGoal::startBuilder()
/* In a sandbox, for determinism, always use the same temporary
directory. */
- tmpDirInSandbox = useChroot ? canonPath("/tmp/guix-build-", true) +
drvName + "-0" : tmpDir;
+ tmpDirInSandbox = useChroot ? canonPath("/tmp", true) + "/guix-build-" +
drvName + "-0" : tmpDir;
/* For convenience, set an environment pointing to the top build
directory. */