From b9e02a71a972e51a921fada9e1acbb58280f2ed3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 25 Feb 2015 00:11:18 +0100 Subject: gnu: glibc-locales: Install to lib/locales. Suggested by Andreas Schwab at . * gnu/packages/base.scm (glibc-locales) <#:configure-flags>: Change "/share/locale" to "/lib/locale". --- gnu/packages/base.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/base.scm') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 554e848369..3f2bd92bed 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -551,9 +551,10 @@ (define-public glibc-locales (alist-delete 'install ,phases))) ((#:configure-flags flags) `(append ,flags + ;; Use $(libdir)/locale as is the case by default. (list (string-append "libc_cv_localedir=" (assoc-ref %outputs "out") - "/share/locale"))))))))) + "/lib/locale"))))))))) (define-public tzdata (package -- cgit v1.2.3 From c9505f3ffa9597c6d765d871d800e56fb45dd7ef Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 25 Feb 2015 13:58:15 +0100 Subject: gnu: Add glibc-utf8-locales. * gnu/packages/base.scm (glibc-utf8-locales): New variable. --- gnu/packages/base.scm | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) (limited to 'gnu/packages/base.scm') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 3f2bd92bed..9c5d6b7b27 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -29,6 +29,7 @@ (define-module (gnu packages base) #:use-module (gnu packages ed) #:use-module (gnu packages guile) #:use-module (gnu packages multiprecision) + #:use-module (gnu packages compression) #:use-module (gnu packages perl) #:use-module (gnu packages linux) #:use-module (gnu packages texinfo) @@ -36,7 +37,8 @@ (define-module (gnu packages base) #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial)) ;;; Commentary: ;;; @@ -556,6 +558,46 @@ (define-public glibc-locales (assoc-ref %outputs "out") "/lib/locale"))))))))) +(define-public glibc-utf8-locales + (package + (name "glibc-utf8-locales") + (version (package-version glibc)) + (source #f) + (build-system trivial-build-system) + (arguments + '(#:modules ((guix build utils)) + #:builder (begin + (use-modules (srfi srfi-1) + (guix build utils)) + + (let* ((libc (assoc-ref %build-inputs "glibc")) + (gzip (assoc-ref %build-inputs "gzip")) + (out (assoc-ref %outputs "out")) + (localedir (string-append out "/lib/locale"))) + ;; 'localedef' needs 'gzip'. + (setenv "PATH" (string-append libc "/bin:" gzip "/bin")) + + (mkdir-p localedir) + (every (lambda (locale) + (zero? (system* "localedef" "--no-archive" + "--prefix" localedir "-i" locale + "-f" "UTF-8" + (string-append localedir "/" + locale + ".UTF-8")))) + + ;; These are the locales commonly used for + ;; tests---e.g., in Guile's i18n tests. + '("de_DE" "el_GR" "en_US" "fr_FR" "tr_TR")))))) + (inputs `(("glibc" ,glibc) + ("gzip" ,gzip))) + (synopsis "Small sample of UTF-8 locales") + (description + "This package provides a small sample of UTF-8 locales mostly useful in +test environments.") + (home-page (package-home-page glibc)) + (license (package-license glibc)))) + (define-public tzdata (package (name "tzdata") -- cgit v1.2.3