guix-commits
[Top][All Lists]
Advanced

[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")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]