diff mbox series

[bug#67507,v2,1/2] gnu: Add ‘libc-locales-for-target’ and related.

Message ID a7d49941fef39efd124e8750c53608883179dd1a.1701272537.git.ludo@gnu.org
State New
Headers show
Series [bug#67507,v2,1/2] gnu: Add ‘libc-locales-for-target’ and related. | expand

Commit Message

Ludovic Courtès Nov. 29, 2023, 3:44 p.m. UTC 
From: Janneke Nieuwenhuizen <janneke@gnu.org>

Partly fixes <https://issues.guix.gnu.org/66472>.

This is a followup to 95ea1277ae2ebd278bdb51a7887f5ba1116fbc64.

* gnu/packages/base.scm (glibc-locales/hurd): New variable
(libc-locales-for-target): Use it in new procedure.
(libc-utf8-locales-for-target): New procedure.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
Change-Id: I16e187fcc65a5d4a3b065066b45ef9e45d1875f6
---
 gnu/packages/base.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
diff mbox series

Patch

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 41aff0ca97..6b2e96dc9b 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -76,6 +76,8 @@  (define-module (gnu packages base)
   #:use-module (srfi srfi-26)
   #:export (glibc
             libc-for-target
+            libc-locales-for-target
+            libc-utf8-locales-for-target
             make-ld-wrapper
             libiconv-if-needed
             %final-inputs))
@@ -1526,6 +1528,23 @@  (define* (libc-for-target #:optional
     (_
      glibc)))
 
+(define-public glibc-locales/hurd
+  (make-glibc-locales glibc/hurd))
+
+(define* (libc-locales-for-target #:optional
+                                  (target (or (%current-target-system)
+                                              (%current-system))))
+  (if (target-hurd? target)
+      glibc-locales/hurd
+      glibc-locales))
+
+(define* (libc-utf8-locales-for-target #:optional
+                                       (target (or (%current-target-system)
+                                                   (%current-system))))
+  (if (target-hurd? target)
+      glibc-utf8-locales/hurd
+      glibc-utf8-locales))
+
 (define-public tzdata
   (package
     (name "tzdata")