branch master updated: website: Use the right ‘glibc-locales’ package.

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch master
in repository guix-artwork.

The following commit(s) were added to refs/heads/master by this push:
     new 49cb741  website: Use the right ‘glibc-locales’ package.
49cb741 is described below

commit 49cb74182e4cfd9e8394eb7ed8b43f317a40d5a3
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Jan 15 23:15:50 2024 +0100

    website: Use the right ‘glibc-locales’ package.
    
    This works around <https://issues.guix.gnu.org/67586>, whereby
    (specification->package "glibc-locales") would return version 2.37 of
    that package, a GNU/Hurd variant that fails to build on GNU/Linux.
    
    * website/.guix.scm (lingua-web-site): Use ‘libc-locales-for-target’
    instead of (specification->package "glibc-locales").
---
 website/.guix.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/website/.guix.scm b/website/.guix.scm
index fd79a2d..6c4e9a8 100644
--- a/website/.guix.scm
+++ b/website/.guix.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix web site
-;;; Copyright © 2017, 2019, 2020, 2021, 2023 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2017, 2019-2021, 2023-2024 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de>
 ;;;
 ;;; This file is part of the GNU Guix web site.
@@ -31,6 +31,8 @@
 (set! %load-path (cons this-directory %load-path))
 
 (use-modules (guix) (gnu)
+             ((gnu packages base)
+              #:select (libc-locales-for-target))
              (gnu packages guile)
              (gnu packages guile-xyz)
              (gnu packages package-management)
@@ -118,6 +120,9 @@
 
 (define (lingua-web-site lingua)
   "Return the web site built for LINGUA."
+  (define glibc-locales
+    (libc-locales-for-target))
+
   (define build
     ;; We need Guile-JSON for 'packages-json-builder'.
     (with-extensions (append (package+propagated-inputs
@@ -166,8 +171,7 @@
 
             ;; So we can read/write UTF-8 files.
             (setenv "GUIX_LOCPATH"
-                    #+(file-append (specification->package "glibc-locales")
-                                   "/lib/locale"))
+                    #+(file-append glibc-locales "/lib/locale"))
 
             ;; Use a sane default.
             (setenv "XDG_CACHE_HOME" "/tmp/.cache")