diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-12-10 13:25:47 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-12-10 13:25:47 +0200 |
| commit | 34eaf5714efcb847c9cba03a055a17e790c1d017 (patch) | |
| tree | d9c534cac0e668052e6b3c5b11602d0773aa5068 /gnu/packages/base.scm | |
| parent | 99f7f6457485d524c560bce428fb8c3997e2b553 (diff) | |
| parent | 63e06f30ce20fa846a7e2e814976fefcd9eda7d3 (diff) | |
Merge remote-tracking branch 'origin/master' into rust-team
Change-Id: Ic45f7071abd6a02c2ccad411500e5103c8272ffb
Diffstat (limited to 'gnu/packages/base.scm')
| -rw-r--r-- | gnu/packages/base.scm | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 41aff0ca97..ea6fdc3b88 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,26 @@ command.") (_ glibc))) +(define-public glibc-locales/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) + (%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") |