[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/92: gnu: Add libc-locales-for-target and glibc-locales/hurd.
From: |
guix-commits |
Subject: |
09/92: gnu: Add libc-locales-for-target and glibc-locales/hurd. |
Date: |
Fri, 23 Jun 2023 12:45:37 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit c4475d92f8cadb1ada4af5a7a9af7a752e5f13c6
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Wed Jun 7 19:19:01 2023 +0200
gnu: Add libc-locales-for-target and glibc-locales/hurd.
* gnu/packages/base.scm (glibc-locales/hurd): New variable
(libc-locales-for-target): Use it in new procedure.
(glibc-utf8-locales/hurd): New variable.
(libc-utf8-locales-for-target): Use it in new procedure.
---
gnu/packages/base.scm | 35 +++++++++++++++++++++++++++++++----
1 file changed, 31 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 304b0713ee..86e7f0bcdc 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))
@@ -1450,10 +1452,10 @@ command.")
(native-inputs
(modify-inputs (package-native-inputs glibc/hurd)
(prepend (if (%current-target-system)
- (let* ((cross-base (resolve-interface '(gnu packages
cross-base)))
- (cross-mig (module-ref cross-base 'cross-mig)))
- (cross-mig (%current-target-system)))
- mig))))
+ (let* ((cross-base (resolve-interface '(gnu packages
cross-base)))
+ (cross-mig (module-ref cross-base 'cross-mig)))
+ (cross-mig (%current-target-system)))
+ mig))))
(arguments
(substitute-keyword-arguments (package-arguments glibc/hurd)
;; We just pass the flags really needed to build the headers.
@@ -1485,6 +1487,31 @@ 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))))
+ (match target
+ ((? target-hurd?)
+ glibc-locales/hurd)
+ (_
+ glibc-locales)))
+
+(define-public glibc-utf8-locales/hurd
+ (hidden-package
+ (make-glibc-utf8-locales glibc/hurd)))
+
+(define* (libc-utf8-locales-for-target #:optional
+ (target (or (%current-target-system)
+ (%current-system))))
+ (match target
+ ((? target-hurd?)
+ glibc-utf8-locales/hurd)
+ (_
+ glibc-utf8-locales)))
+
(define-public tzdata
(package
(name "tzdata")
- 02/92: gnu: glibc/hurd-headers: Properly cross-build., (continued)
- 02/92: gnu: glibc/hurd-headers: Properly cross-build., guix-commits, 2023/06/23
- 05/92: gnu: Add libc-for-target and glibc/hurd., guix-commits, 2023/06/23
- 10/92: gnu: mig: Update to 04bfe7a91223ba15d868f7165e49328b1c6e86c3., guix-commits, 2023/06/23
- 14/92: gnu: Add libpciaccess-0.17., guix-commits, 2023/06/23
- 16/92: gnu: Add rumpkernel., guix-commits, 2023/06/23
- 19/92: gnu: hurd: Add rumpkernel., guix-commits, 2023/06/23
- 08/92: gnu: gnumach: Update to 1.8+git20221224., guix-commits, 2023/06/23
- 12/92: gnu: hurd: Update to v0.9.git20230216., guix-commits, 2023/06/23
- 13/92: Revert "hurd-boot: Add urandom and default-pager translators.", guix-commits, 2023/06/23
- 15/92: gnu: hurd: Update libpciaccess to 0.17., guix-commits, 2023/06/23
- 09/92: gnu: Add libc-locales-for-target and glibc-locales/hurd.,
guix-commits <=
- 11/92: squash! gnu: mig: Update to 04bfe7a91223ba15d868f7165e49328b1c6e86c3., guix-commits, 2023/06/23
- 17/92: gnu: hurd-minimal: Include libshouldbeinlibc and libstore., guix-commits, 2023/06/23
- 18/92: gnu: parted: Support building for the Hurd., guix-commits, 2023/06/23
- 21/92: services: childhurd: Bump default qemu memory to 2048MB., guix-commits, 2023/06/23
- 20/92: hurd-boot: Setup pci-arbiter and rumpdisk translators., guix-commits, 2023/06/23
- 23/92: bootloader: grub: Use rumpdisk-style root when booting with "noide"., guix-commits, 2023/06/23
- 25/92: gnu: netdde: Resurrect and update to 2.6.32.65-2-e67c284ac1., guix-commits, 2023/06/23
- 26/92: hurd-boot: Cater for netdde., guix-commits, 2023/06/23
- 28/92: services: static-networking: Support netdde for the Hurd., guix-commits, 2023/06/23
- 31/92: gnu: commencement: Add automake-boot0., guix-commits, 2023/06/23