[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/24: system: bare-hurd.tmpl: Include glibc-2.33 locales in cross-build
From: |
guix-commits |
Subject: |
10/24: system: bare-hurd.tmpl: Include glibc-2.33 locales in cross-build. |
Date: |
Fri, 29 Sep 2023 06:10:54 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit c2f17caff09a23986c2ac497b1a428b34ab33349
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sun Sep 17 08:18:56 2023 +0200
system: bare-hurd.tmpl: Include glibc-2.33 locales in cross-build.
This fixes building of guile-avahi in the childhurd.
* gnu/system/examples/bare-hurd.tmpl (%hurd-os)[locale-libcs]: New field.
---
gnu/system/examples/bare-hurd.tmpl | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/gnu/system/examples/bare-hurd.tmpl
b/gnu/system/examples/bare-hurd.tmpl
index 463c7ee798..ac5f2194eb 100644
--- a/gnu/system/examples/bare-hurd.tmpl
+++ b/gnu/system/examples/bare-hurd.tmpl
@@ -23,9 +23,9 @@
;;
;; guix build hello
-(use-modules (gnu) (gnu system hurd) (guix utils))
+(use-modules (gnu) (gnu system hurd) (gnu system locale) (guix utils))
(use-service-modules ssh)
-(use-package-modules ssh)
+(use-package-modules base ssh)
(define %hurd-os
(operating-system
@@ -40,6 +40,11 @@
%base-file-systems))
(host-name "guixygnu")
(timezone "Europe/Amsterdam")
+ ;; FIXME: guile-avahi won't build in a VM with only libc-2.37?
+ ;; encoding-error "scm_to_stringn" "cannot convert narrow string to output
locale" 1073741930 #f #f
+ (locale-libcs (if (system-hurd?)
+ (list glibc/hurd)
+ %default-locale-libcs))
(users (cons (user-account
(name "guix")
(comment "Anonymous Hurd Hacker")
- 05/24: DRAFT hurd-boot: Support second boot., (continued)
- 05/24: DRAFT hurd-boot: Support second boot., guix-commits, 2023/09/29
- 06/24: DRAFT system: examples: Add devel-hurd.tmpl., guix-commits, 2023/09/29
- 14/24: services: hurd-vm: Use the default SSH port number., guix-commits, 2023/09/29
- 15/24: gnu: glibc-utf8-locales: Reintroduce input labels., guix-commits, 2023/09/29
- 12/24: system: vm: Remove unused variable., guix-commits, 2023/09/29
- 13/24: secret-service: Increase default handshake timeout., guix-commits, 2023/09/29
- 03/24: system: hurd: Add swap-services to hurd-default-essential-services., guix-commits, 2023/09/29
- 11/24: Revert "system: bare-hurd.tmpl: Include glibc-2.33 locales in cross-build.", guix-commits, 2023/09/29
- 08/24: DRAFT daemon: Support chroot builds on GNU/Hurd., guix-commits, 2023/09/29
- 09/24: Revert "DRAFT daemon: Support chroot builds on GNU/Hurd.", guix-commits, 2023/09/29
- 10/24: system: bare-hurd.tmpl: Include glibc-2.33 locales in cross-build.,
guix-commits <=
- 17/24: services: guix: Support declarative offloading setup., guix-commits, 2023/09/29
- 18/24: services: childhurd: Authorize the childhurd’s key on the host., guix-commits, 2023/09/29
- 19/24: services: hurd-vm: ‘image’ field has to be an <image> record., guix-commits, 2023/09/29
- 20/24: tests: hurd-vm: Remove custom disk image configuration., guix-commits, 2023/09/29
- 21/24: services: hurd-vm: Disable password-based authentication for root., guix-commits, 2023/09/29
- 22/24: doc: Give an example showing how to add an account in the childhurd., guix-commits, 2023/09/29
- 16/24: services: guix: Use the right locale package on GNU/Hurd., guix-commits, 2023/09/29
- 23/24: services: hurd-vm: Implement zero-configuration offloading., guix-commits, 2023/09/29
- 24/24: gnu: guix: Update to 1.4.0-12.449ed59b54., guix-commits, 2023/09/29