From 9442b53c6b4dbf078f37a52687a32ecbd2ca430d Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Wed, 7 Jun 2023 19:19:01 +0200 Subject: gnu: Add ‘libc-locales-for-target’ and related. 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(+) (limited to 'gnu/packages/base.scm') 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") -- cgit v1.2.3 From 4a6cef9d66ff26e96d63f2f1f886b8212154ca00 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 6 Dec 2023 17:08:53 +0100 Subject: gnu: glibc-locales@2.37: Mark as hidden. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * gnu/packages/base.scm (glibc-locales/hurd): Wrap in ‘hidden-package’. Change-Id: If4f4aa1ef66c53ee0bb52eaea533241652e48cca Reported-by: Nils Landt Change-Id: I5150f13be9c3b23e7abe408f815c56f498c92ecb --- gnu/packages/base.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/base.scm') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 6b2e96dc9b..ea6fdc3b88 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1529,7 +1529,10 @@ (define* (libc-for-target #:optional glibc))) (define-public glibc-locales/hurd - (make-glibc-locales glibc/hurd)) + ;; Locales again; hide them because their 'supported-systems' field suggests + ;; they're Hurd-only, making them non-installable on GNU/Linux. + (hidden-package + (make-glibc-locales glibc/hurd))) (define* (libc-locales-for-target #:optional (target (or (%current-target-system) -- cgit v1.2.3