nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build-system/gnu: Set $LC_ALL (or similar) to the chosen locale. 

Suggested by Mark H Weaver.

* guix/build/utils.scm (locale-category->string): New procedure.
* guix/build/gnu-build-system.scm (install-locale): Add 'setenv' call.
This commit is contained in:
Ludovic Courtès 2015-02-27 14:54:00 +01:00
parent 7184b4b1bd
commit 251e8b2ee8
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
guix/build/gnu-build-system.scm
View File

@ -106,8 +106,12 @@ chance to be set."
(catch 'system-error (catch 'system-error
(lambda () (lambda ()
(setlocale locale-category locale) (setlocale locale-category locale)
(format (current-error-port) "using '~a' locale for category ~a~%"
locale locale-category) ;; While we're at it, pass it to sub-processes.
(setenv (locale-category->string locale-category) locale)
(format (current-error-port) "using '~a' locale for category ~s~%"
locale (locale-category->string locale-category))
#t) #t)
(lambda args (lambda args
;; This is known to fail for instance in early bootstrap where locales ;; This is known to fail for instance in early bootstrap where locales

26
guix/build/utils.scm
View File

@ -21,6 +21,7 @@
(define-module (guix build utils) (define-module (guix build utils)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-11) #:use-module (srfi srfi-11)
#:use-module (srfi srfi-60)
#:use-module (ice-9 ftw) #:use-module (ice-9 ftw)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (ice-9 regex) #:use-module (ice-9 regex)
@ -65,7 +66,9 @@
patch-/usr/bin/file patch-/usr/bin/file
fold-port-matches fold-port-matches
remove-store-references remove-store-references
wrap-program)) wrap-program
locale-category->string))
;;; ;;;
@ -909,6 +912,27 @@ the previous wrapper."
(symlink wrapper prog-tmp) (symlink wrapper prog-tmp)
(rename-file prog-tmp prog))) (rename-file prog-tmp prog)))
;;;
;;; Locales.
;;;
(define (locale-category->string category)
"Return the name of locale category CATEGORY, one of the 'LC_' constants.
If CATEGORY is a bitwise or of several 'LC_' constants, an approximation is
returned."
(letrec-syntax ((convert (syntax-rules ()
((_)
(number->string category))
((_ first rest ...)
(if (= first category)
(symbol->string 'first)
(convert rest ...))))))
(convert LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE
LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY
LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE
LC_TIME)))
;;; Local Variables: ;;; Local Variables:
;;; eval: (put 'call-with-output-file/atomic 'scheme-indent-function 1) ;;; eval: (put 'call-with-output-file/atomic 'scheme-indent-function 1)
;;; eval: (put 'call-with-ascii-input-file 'scheme-indent-function 1) ;;; eval: (put 'call-with-ascii-input-file 'scheme-indent-function 1)