[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: services: guix: Support building in a directory besides '/tmp'.
From: |
Leo Famulari |
Subject: |
01/01: services: guix: Support building in a directory besides '/tmp'. |
Date: |
Thu, 23 Feb 2017 13:03:22 -0500 (EST) |
lfam pushed a commit to branch master
in repository guix.
commit b191f0a6c50f2a7d47037ef8509d0351f5a2646e
Author: Leo Famulari <address@hidden>
Date: Thu Feb 23 12:08:02 2017 -0500
services: guix: Support building in a directory besides '/tmp'.
* gnu/services/base.scm (<guix-configuration>)[tmpdir]: New field.
(guix-shepherd-service): Use 'tmpdir' in #:environment-variables.
* doc/guix.texi (Base Services)[guix-configuration]: Document it.
---
doc/guix.texi | 3 +++
gnu/services/base.scm | 7 ++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 19a31c6..be11096 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -8615,6 +8615,9 @@ The lsof package to use.
The HTTP proxy used for downloading fixed-output derivations and
substitutes.
address@hidden @code{tmpdir} (default: @code{#f})
+A directory path where the @command{guix-daemon} will perform builds.
+
@end table
@end deftp
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 0fb7bd7..7ae815d 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1116,6 +1116,8 @@ failed to register hydra.gnu.org public key: ~a~%"
status))))))))
(lsof guix-configuration-lsof ;<package>
(default lsof))
(http-proxy guix-http-proxy ;string | #f
+ (default #f))
+ (tmpdir guix-tmpdir ;string | #f
(default #f)))
(define %default-guix-configuration
@@ -1127,7 +1129,7 @@ failed to register hydra.gnu.org public key: ~a~%"
status))))))))
(($ <guix-configuration> guix build-group build-accounts
authorize-key? keys
use-substitutes? substitute-urls extra-options
- log-file lsof http-proxy)
+ log-file lsof http-proxy tmpdir)
(list (shepherd-service
(documentation "Run the Guix daemon.")
(provision '(guix-daemon))
@@ -1147,6 +1149,9 @@ failed to register hydra.gnu.org public key: ~a~%"
status))))))))
(list (string-append "PATH=" #$lsof "/bin")
#$@(if http-proxy
(list (string-append "http_proxy=" http-proxy))
+ '())
+ #$@(if tmpdir
+ (list (string-append "TMPDIR=" tmpdir))
'()))
#:log-file #$log-file))