[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
17/19: locale: Set %default-locale-definitions to glibc/hurd on the Hurd
From: |
guix-commits |
Subject: |
17/19: locale: Set %default-locale-definitions to glibc/hurd on the Hurd. |
Date: |
Sat, 2 Sep 2023 11:48:57 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit ec95202a488046d946d69380084f4e6ebc51814d
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sat Jun 24 15:17:42 2023 +0200
locale: Set %default-locale-definitions to glibc/hurd on the Hurd.
* gnu/system/locale.scm (%default-locale-libcs): Use only glib/hurd when
building on the Hurd.
---
gnu/system/locale.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/gnu/system/locale.scm b/gnu/system/locale.scm
index 6895b209dc..bc572baeb9 100644
--- a/gnu/system/locale.scm
+++ b/gnu/system/locale.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014-2017, 2019-2021, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <jannek@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -147,7 +148,9 @@ data format changes between libc versions."
(define %default-locale-libcs
;; The libcs for which we build locales by default.
- (list glibc-2.33 glibc))
+ (if (system-hurd?)
+ (list glibc/hurd)
+ (list glibc-2.33 glibc)))
(define %default-locale-definitions
;; Arbitrary set of locales that are built by default. They are here mostly
- 08/19: gnu: librsvg: Build without gobject-introspection for the Hurd., (continued)
- 08/19: gnu: librsvg: Build without gobject-introspection for the Hurd., guix-commits, 2023/09/02
- 10/19: hurd-boot: Support system init: Create essential device nodes., guix-commits, 2023/09/02
- 01/19: self: Build directories in chunks of max 25 files at a time., guix-commits, 2023/09/02
- 19/19: Revert "DRAFT daemon: Support chroot builds on GNU/Hurd.", guix-commits, 2023/09/02
- 05/19: squash! self: Build directories in chunks of max 25 files at a time. -- remove gc, guix-commits, 2023/09/02
- 02/19: gnu: guix: Update to 1.4.0-11.45de303d8b., guix-commits, 2023/09/02
- 14/19: DRAFT hurd-boot: Support second boot., guix-commits, 2023/09/02
- 16/19: gnu: Add libc-locales-for-target and glibc-locales/hurd., guix-commits, 2023/09/02
- 18/19: DRAFT daemon: Support chroot builds on GNU/Hurd., guix-commits, 2023/09/02
- 15/19: DRAFT system: examples: Add devel-hurd.tmpl., guix-commits, 2023/09/02
- 17/19: locale: Set %default-locale-definitions to glibc/hurd on the Hurd.,
guix-commits <=
- 12/19: system: hurd: Add swap-services to hurd-default-essential-services., guix-commits, 2023/09/02