diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2023-01-07 19:12:30 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2023-01-07 19:41:51 +0100 |
| commit | 78a9b4f996ba18b4460ba380b87e9538007c27e0 (patch) | |
| tree | 018983ef6ea5485f81c3c88d95dee70bba963630 | |
| parent | db746d16602f4b22ed678aaaeeb5974398d27874 (diff) | |
| download | guix-78a9b4f996ba18b4460ba380b87e9538007c27e0.tar.gz | |
services: base: Add extra-env support to guix-configuration.
* gnu/services/base.scm (<guix-configuration>)[extra-env]: New field. (guix-shepherd-service): Honor it. * doc/guix.texi (Base Services): Document it.
| -rw-r--r-- | doc/guix.texi | 4 | ||||
| -rw-r--r-- | gnu/services/base.scm | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 293c3016aa..e337945ba7 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -18482,6 +18482,10 @@ herd set-http-proxy guix-daemon @item @code{tmpdir} (default: @code{#f}) A directory path where the @command{guix-daemon} will perform builds. +@item @code{extra-env} (default: @code{'()}) +Environment variables to be set before starting the daemon, as a list of +@code{key=value} strings. + @end table @end deftp diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 6993e1f174..0b387ee0f5 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -198,6 +198,7 @@ guix-configuration-generate-substitute-key? guix-configuration-extra-options guix-configuration-log-file + guix-configuration-extra-env guix-extension guix-extension? @@ -1654,7 +1655,9 @@ archive' public keys, with GUIX." (http-proxy guix-http-proxy ;string | #f (default #f)) (tmpdir guix-tmpdir ;string | #f - (default #f))) + (default #f)) + (extra-env guix-configuration-extra-env ;list of strings + (default '()))) (define %default-guix-configuration (guix-configuration)) @@ -1710,7 +1713,7 @@ proxy of 'guix-daemon'...~%") (guix build-group build-accounts authorize-key? authorized-keys use-substitutes? substitute-urls max-silent-time timeout log-compression discover? extra-options log-file - http-proxy tmpdir chroot-directories) + http-proxy tmpdir chroot-directories extra-env) (list (shepherd-service (documentation "Run the Guix daemon.") (provision '(guix-daemon)) @@ -1799,7 +1802,8 @@ proxy of 'guix-daemon'...~%") (if proxy (list (string-append "http_proxy=" proxy) (string-append "https_proxy=" proxy)) - '())) + '()) + '#$extra-env) #:log-file #$log-file)))) (stop #~(make-kill-destructor)))))) |