[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/14: gnu: Add ‘libc-locales-for-target’ and related.
From: |
guix-commits |
Subject: |
03/14: gnu: Add ‘libc-locales-for-target’ and related. |
Date: |
Thu, 30 Nov 2023 04:21:18 -0500 (EST) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 855218eafe9208eeb83398b8533c76f3c9dedbbb
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")
- 14/14: HACK compile-as-derivation: build #:system "i586-gnu"., (continued)
- 14/14: HACK compile-as-derivation: build #:system "i586-gnu"., guix-commits, 2023/11/30
- 05/14: gnu: guix: Update to 1.4.0-16.9ce07b481e., guix-commits, 2023/11/30
- 13/14: Revert "DRAFT daemon: Support chroot builds on GNU/Hurd.", guix-commits, 2023/11/30
- 02/14: Revert "packages: Use glibc-utf8-locales/hurd in %standard-patch-inputs.", guix-commits, 2023/11/30
- 06/14: hurd: Support system init in /libexec/runsystem., guix-commits, 2023/11/30
- 08/14: system: hurd: Add swap-services to hurd-default-essential-services., guix-commits, 2023/11/30
- 12/14: DRAFT daemon: Support chroot builds on GNU/Hurd., guix-commits, 2023/11/30
- 10/14: DRAFT hurd-boot: Support second boot., guix-commits, 2023/11/30
- 07/14: hurd-boot: Support system init: Create essential device nodes., guix-commits, 2023/11/30
- 11/14: DRAFT system: examples: Add devel-hurd.tmpl., guix-commits, 2023/11/30
- 03/14: gnu: Add ‘libc-locales-for-target’ and related.,
guix-commits <=
- 04/14: gnu: Use ‘libc-utf8-locales-for-target’., guix-commits, 2023/11/30
- 09/14: DRAFT hurd: Support second boot., guix-commits, 2023/11/30