aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanneke Nieuwenhuizen <janneke@gnu.org>2023-06-07 19:19:01 +0200
committerLudovic Courtès <ludo@gnu.org>2023-12-02 12:25:45 +0100
commit9442b53c6b4dbf078f37a52687a32ecbd2ca430d (patch)
treef9b4a3d9d3f463dcaea6fda580dfc19dad96d87e
parentea348b105d1fb8f02b3ca8665c5ad33928f7483f (diff)
downloadguix-9442b53c6b4dbf078f37a52687a32ecbd2ca430d.tar
guix-9442b53c6b4dbf078f37a52687a32ecbd2ca430d.tar.gz
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
-rw-r--r--gnu/packages/base.scm19
1 files changed, 19 insertions, 0 deletions
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")