From 9442b53c6b4dbf078f37a52687a32ecbd2ca430d Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Wed, 7 Jun 2023 19:19:01 +0200 Subject: [PATCH] =?UTF-8?q?gnu:=20Add=20=E2=80=98libc-locales-for-target?= =?UTF-8?q?=E2=80=99=20and=20related.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Partly fixes . 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 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")