[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/15: locale: Set %default-locale-definitions to glibc/hurd on the Hurd
From: |
guix-commits |
Subject: |
15/15: locale: Set %default-locale-definitions to glibc/hurd on the Hurd. |
Date: |
Thu, 20 Jul 2023 04:35:51 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit f0a5ec7ac3d59e0166b3913f7e96e6505b5317fe
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
- 07/15: build: Build gnu/packages/*.go in five steps., (continued)
- 07/15: build: Build gnu/packages/*.go in five steps., guix-commits, 2023/07/20
- 06/15: system: hurd: Add swap-services to hurd-default-essential-services., guix-commits, 2023/07/20
- 05/15: system: hurd: Add procps to %base-packages/hurd., guix-commits, 2023/07/20
- 09/15: gnu: guix: Update to 1.4.0-8.fde86c4932., guix-commits, 2023/07/20
- 08/15: self: Build gnu/packages/*.go in 26 steps on the Hurd., guix-commits, 2023/07/20
- 01/15: gnu: guix: Disable some test on 32bit., guix-commits, 2023/07/20
- 02/15: gnu: guix: Disable some tests on the Hurd., guix-commits, 2023/07/20
- 13/15: DRAFT system: examples: Add devel-hurd.tmpl., guix-commits, 2023/07/20
- 04/15: hurd-boot: Support system init: Create essential device nodes., guix-commits, 2023/07/20
- 10/15: gnu: guix: Update to 1.4.0-9.0ac1cf36a8., guix-commits, 2023/07/20
- 15/15: locale: Set %default-locale-definitions to glibc/hurd on the Hurd.,
guix-commits <=
- 12/15: DRAFT hurd-boot: Support second boot., guix-commits, 2023/07/20
- 11/15: DRAFT hurd: Support second boot., guix-commits, 2023/07/20