[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/15: packages: Use glibc-utf8-locales/hurd in %standard-patch-inputs.

From: guix-commits
Subject: 03/15: packages: Use glibc-utf8-locales/hurd in %standard-patch-inputs.
Date: Thu, 30 Nov 2023 01:17:44 -0500 (EST)

janneke pushed a commit to branch hurd-team
in repository guix.

commit adee4911fed08582dd4f4c4b39ea81bf24059221
Author: Christopher Baines <>
AuthorDate: Tue Nov 28 11:33:41 2023 +0000

    packages: Use glibc-utf8-locales/hurd in %standard-patch-inputs.
    When targeting the hurd.  This is a follow up to
    95ea1277ae2ebd278bdb51a7887f5ba1116fbc64 that prevents an infinite loop when
    trying to compute the derivation for guix for the hurd.
    * guix/packages.scm (%standard-patch-inputs): Use glibc-utf8-locales/hurd 
    targeting the hurd.
    Change-Id: I8cdc2d9c28677000290ca1b31f580c4d3043f1ef
 guix/packages.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/guix/packages.scm b/guix/packages.scm
index e2e82692ad..f4aa0e78fa 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -866,7 +866,10 @@ identifiers.  The result is inferred from the file names 
of patches."
       ("lzip"  ,(ref '(gnu packages compression) 'lzip))
       ("unzip" ,(ref '(gnu packages compression) 'unzip))
       ("patch" ,(ref '(gnu packages base) 'patch))
-      ("locales" ,(ref '(gnu packages base) 'glibc-utf8-locales)))))
+      ("locales" ,(ref '(gnu packages base)
+                       (if (target-hurd?)
+                           'glibc-utf8-locales/hurd
+                           'glibc-utf8-locales))))))
 (define (default-guile)
   "Return the default Guile package used to run the build code of

reply via email to

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