[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/14: system: bare-hurd.tmpl: Include glibc-2.33 locales in cross-build
From: |
guix-commits |
Subject: |
05/14: system: bare-hurd.tmpl: Include glibc-2.33 locales in cross-build. |
Date: |
Mon, 18 Sep 2023 02:19:56 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 52875ddc03fd54a31421bd13c3a0cf68f8d136be
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")
- branch hurd-team created (now fe0246826a), guix-commits, 2023/09/18
- 01/14: self: Compile guix-packages-base in chunks of 10 files., guix-commits, 2023/09/18
- 02/14: gnu: guix: Update to 1.4.0-12.66ea1a1cc1., guix-commits, 2023/09/18
- 05/14: system: bare-hurd.tmpl: Include glibc-2.33 locales in cross-build.,
guix-commits <=
- 07/14: hurd-boot: Support system init: Create essential device nodes., guix-commits, 2023/09/18
- 13/14: DRAFT daemon: Support chroot builds on GNU/Hurd., guix-commits, 2023/09/18
- 11/14: DRAFT system: examples: Add devel-hurd.tmpl., guix-commits, 2023/09/18
- 06/14: hurd: Support system init in /libexec/runsystem., guix-commits, 2023/09/18
- 10/14: DRAFT hurd-boot: Support second boot., guix-commits, 2023/09/18
- 12/14: gnu: Add libc-locales-for-target and glibc-locales/hurd., guix-commits, 2023/09/18
- 04/14: maint: Support `guix shell' in Guix's git archive with manifest.scm., guix-commits, 2023/09/18
- 03/14: gnu: guix: Update to 1.4.0-13.a2549163f5., guix-commits, 2023/09/18
- 08/14: system: hurd: Add swap-services to hurd-default-essential-services., guix-commits, 2023/09/18
- 09/14: DRAFT hurd: Support second boot., guix-commits, 2023/09/18