guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/13: gnu: Add ‘libc-locales-for-target’ and related.


From: guix-commits
Subject: 03/13: gnu: Add ‘libc-locales-for-target’ and related.
Date: Wed, 29 Nov 2023 12:34:30 -0500 (EST)

janneke pushed a commit to branch hurd-team
in repository guix.

commit 2b7ba785c83ec82a77972c001546865a5416828e
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Wed Nov 29 16:44:50 2023 +0100

    gnu: Add ‘libc-locales-for-target’ and related.
    
    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 --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 @@
   #: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 @@ command.")
     (_
      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")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]