GNU bug report logs - #67507
[PATCH] packages: Use glibc-utf8-locales/hurd in %standard-patch-inputs.

Previous Next

Package: guix-patches;

Reported by: Christopher Baines <mail <at> cbaines.net>

Date: Tue, 28 Nov 2023 11:35:01 UTC

Severity: normal

Tags: patch

Done: Ludovic Courtès <ludo <at> gnu.org>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: Ludovic Courtès <ludo <at> gnu.org>
To: 67507 <at> debbugs.gnu.org
Cc: Ludovic Courtès <ludo <at> gnu.org>, Janneke Nieuwenhuizen <janneke <at> gnu.org>
Subject: [bug#67507] [PATCH v2 1/2] gnu: Add ‘libc-locales-for-target’ and related.
Date: Wed, 29 Nov 2023 16:44:50 +0100
From: Janneke Nieuwenhuizen <janneke <at> 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 <at> 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 @@ (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")
-- 
2.41.0





This bug report was last modified 1 year and 223 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.