all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Ludovic Courtès" <ludo@gnu.org>
To: 67507@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@gnu.org>,
	"Janneke Nieuwenhuizen" <janneke@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	[thread overview]
Message-ID: <a7d49941fef39efd124e8750c53608883179dd1a.1701272537.git.ludo@gnu.org> (raw)
In-Reply-To: <5bf71a8fa945627d1610b772a04ac65031e8d6b6.1701171221.git.mail@cbaines.net>

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 --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





  parent reply	other threads:[~2023-11-29 15:46 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-28 11:33 [bug#67507] [PATCH] packages: Use glibc-utf8-locales/hurd in %standard-patch-inputs Christopher Baines
2023-11-29 15:44 ` [bug#67507] [PATCH v2 0/2] Using the right locales on GNU/Hurd Ludovic Courtès
2023-11-29 17:39   ` Janneke Nieuwenhuizen
2023-11-30 21:43     ` Ludovic Courtès
2023-12-01 19:49       ` Janneke Nieuwenhuizen
2023-12-02 11:39         ` bug#67507: " Ludovic Courtès
2023-12-02 14:38           ` [bug#67507] " Janneke Nieuwenhuizen
2023-12-04 19:34           ` itd
2023-12-01 18:42   ` Christopher Baines
2023-11-29 15:44 ` Ludovic Courtès [this message]
2023-11-29 15:44 ` [bug#67507] [PATCH v2 2/2] gnu: Use ‘libc-utf8-locales-for-target’ Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=a7d49941fef39efd124e8750c53608883179dd1a.1701272537.git.ludo@gnu.org \
    --to=ludo@gnu.org \
    --cc=67507@debbugs.gnu.org \
    --cc=janneke@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.