GNU bug report logs - #67507
[PATCH] packages: Use glibc-utf8-locales/hurd in %standard-patch-inputs.

Previous Next

Full log

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: guix-patches <at> gnu.org
Subject: [PATCH] packages: Use glibc-utf8-locales/hurd in
 %standard-patch-inputs.
Date: Tue, 28 Nov 2023 11:33:41 +0000

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 when
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 @@ (define (%standard-patch-inputs)
       ("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

base-commit: 62376e3eb67644454bc655bed56be4be965bd13e
-- 
2.41.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.