[bug#67507] packages: Use glibc-utf8-locales/hurd in %standard-patch-inputs.
Commit Message
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(-)
base-commit: 62376e3eb67644454bc655bed56be4be965bd13e
Comments
Ludovic Courtès <ludo@gnu.org> writes:
> This is an updated version of Janneke's patches
> in <https://issues.guix.gnu.org/66472> combined with
> Christopher's patch from <https://issues.guix.gnu.org/67507>.
> Team work!
>
> This should fix the infamous dependency cycle introduced
> in 95ea1277ae2ebd278bdb51a7887f5ba1116fbc64 *and* ensure
> the right version of glibc locale data is used throughout.
These changes look good to me.
For the data service instances, it would be good to fix the infinite
loop issue sooner rather than later. For affected revisions, I think the
data service is effectively waiting until the relevant processes run out
of memory and crash, and this is slowing down processing revisions.
@@ -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