diff options
| author | Mathieu Lirzin | 2016-05-02 17:53:40 +0200 |
|---|---|---|
| committer | Mathieu Lirzin | 2016-05-02 17:53:40 +0200 |
| commit | c3052d6bcd2193b258fb92b99291a4918931fe36 (patch) | |
| tree | 0e0cbbc019e68f4f1c865b4d2f5e341eb45d96ee /guix/store.scm | |
| parent | 0bfb9b439953b755a510974e51e651f79526a5a4 (diff) | |
| parent | b74f64a960542b0679ab13de0dd28adc496cf084 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/store.scm')
| -rw-r--r-- | guix/store.scm | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/guix/store.scm b/guix/store.scm index 906611658..8d1099dab 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -22,6 +22,7 @@ #:use-module (guix serialization) #:use-module (guix monads) #:autoload (guix base32) (bytevector->base32-string) + #:autoload (guix build syscalls) (terminal-columns) #:use-module (rnrs bytevectors) #:use-module (rnrs io ports) #:use-module (srfi srfi-1) @@ -530,7 +531,13 @@ encoding conversion errors." ;; the daemon's settings are used. Otherwise, it ;; overrides the daemons settings; see 'guix ;; substitute'. - (substitute-urls #f)) + (substitute-urls #f) + + ;; Number of columns in the client's terminal. + (terminal-columns (terminal-columns)) + + ;; Locale of the client. + (locale (false-if-exception (setlocale LC_ALL)))) ;; Must be called after `open-connection'. (define socket @@ -565,6 +572,13 @@ encoding conversion errors." ,@(if rounds `(("build-repeat" . ,(number->string (max 0 (1- rounds))))) + '()) + ,@(if terminal-columns + `(("terminal-columns" + . ,(number->string terminal-columns))) + '()) + ,@(if locale + `(("locale" . ,locale)) '())))) (send (string-pairs pairs)))) (let loop ((done? (process-stderr server))) |