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

packages: When possible, use a UTF-8 locale in patch-and-repack. 

* guix/packages.scm (%standard-patch-inputs): Add "locales".
  (patch-and-repack)[builder]: Add 'locales' variable.  When it is true,
  call 'setenv' and 'setlocale'.
This commit is contained in:
Ludovic Courtès 2015-02-27 00:03:17 +01:00
parent b0fd2bd3c5
commit 9cca706c2e
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
guix/packages.scm
View File

@ -335,7 +335,8 @@ corresponds to the arguments expected by `set-path-environment-variable'."
("bzip2" ,(ref '(gnu packages compression) 'bzip2)) ("bzip2" ,(ref '(gnu packages compression) 'bzip2))
("gzip" ,(ref '(gnu packages compression) 'gzip)) ("gzip" ,(ref '(gnu packages compression) 'gzip))
("lzip" ,(ref '(gnu packages compression) 'lzip)) ("lzip" ,(ref '(gnu packages compression) 'lzip))
("patch" ,(ref '(gnu packages base) 'patch))))) ("patch" ,(ref '(gnu packages base) 'patch))
("locales" ,(ref '(gnu packages base) 'glibc-utf8-locales)))))
(define (default-guile) (define (default-guile)
"Return the default Guile package used to run the build code of "Return the default Guile package used to run the build code of
@ -411,7 +412,8 @@ IMPORTED-MODULES specify modules to use/import for use by SNIPPET."
(srfi srfi-1) (srfi srfi-1)
(guix build utils)) (guix build utils))
(let ((out (assoc-ref %outputs "out")) (let ((locales (assoc-ref %build-inputs "locales"))
(out (assoc-ref %outputs "out"))
(xz (assoc-ref %build-inputs "xz")) (xz (assoc-ref %build-inputs "xz"))
(decomp (assoc-ref %build-inputs ,decompression-type)) (decomp (assoc-ref %build-inputs ,decompression-type))
(source (assoc-ref %build-inputs "source")) (source (assoc-ref %build-inputs "source"))
@ -433,6 +435,12 @@ IMPORTED-MODULES specify modules to use/import for use by SNIPPET."
(lambda (name) (lambda (name)
(not (member name '("." ".."))))))) (not (member name '("." "..")))))))
(when locales
;; First of all, install a UTF-8 locale so that UTF-8 file names
;; are correctly interpreted. During bootstrap, LOCALES is #f.
(setenv "LOCPATH" (string-append locales "/lib/locale"))
(setlocale LC_ALL "en_US.UTF-8"))
(setenv "PATH" (string-append xz "/bin" ":" (setenv "PATH" (string-append xz "/bin" ":"
decomp "/bin")) decomp "/bin"))