01/02: gnu: Use 'glibc-utf8-locales-final' in the default patching inputs.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit ec3b1c575d2d866646920490e849c4a0c708df60
Author: Ludovic Courtès <address@hidden>
Date:   Sat Mar 21 21:58:04 2015 +0100

    gnu: Use 'glibc-utf8-locales-final' in the default patching inputs.
    
    * gnu/packages/commencement.scm (glibc-utf8-locales-final): Make public.
    * guix/packages.scm (%standard-patch-inputs): Use
      GLIBC-UTF8-LOCALES-FINAL instead of GLIBC-UTF8-LOCALES.
---
 gnu/packages/commencement.scm |    2 +-
 guix/packages.scm             |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index f312e17..d96a823 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -616,7 +616,7 @@ store.")
                                  (current-source-location)
                                  #:guile %bootstrap-guile)))
 
-(define glibc-utf8-locales-final
+(define-public glibc-utf8-locales-final
   ;; Now that we have GUILE-FINAL, build the UTF-8 locales.  They are needed
   ;; by the build processes afterwards so their 'scm_to_locale_string' works
   ;; with the full range of Unicode codepoints (remember
diff --git a/guix/packages.scm b/guix/packages.scm
index f12ef99..69cfd6d 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -336,7 +336,8 @@ corresponds to the arguments expected by 
`set-path-environment-variable'."
       ("gzip"  ,(ref '(gnu packages compression) 'gzip))
       ("lzip"  ,(ref '(gnu packages compression) 'lzip))
       ("patch" ,(ref '(gnu packages base) 'patch))
-      ("locales" ,(ref '(gnu packages base) 'glibc-utf8-locales)))))
+      ("locales" ,(ref '(gnu packages commencement)
+                       'glibc-utf8-locales-final)))))
 
 (define (default-guile)
   "Return the default Guile package used to run the build code of