[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/13: packages: Use glibc-utf8-locales/hurd in %standard-patch-inputs.
From: |
guix-commits |
Subject: |
01/13: packages: Use glibc-utf8-locales/hurd in %standard-patch-inputs. |
Date: |
Wed, 29 Nov 2023 12:34:30 -0500 (EST) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit e7029c832bded5daadcac8d9d09ed15293a5db09
Author: Christopher Baines <mail@cbaines.net>
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
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 @@ 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
- branch hurd-team created (now 7dae7a0c53), guix-commits, 2023/11/29
- 03/13: gnu: Add ‘libc-locales-for-target’ and related., guix-commits, 2023/11/29
- 01/13: packages: Use glibc-utf8-locales/hurd in %standard-patch-inputs.,
guix-commits <=
- 02/13: Revert "packages: Use glibc-utf8-locales/hurd in %standard-patch-inputs.", guix-commits, 2023/11/29
- 06/13: hurd-boot: Support system init: Create essential device nodes., guix-commits, 2023/11/29
- 04/13: gnu: Use ‘libc-utf8-locales-for-target’., guix-commits, 2023/11/29
- 11/13: DRAFT daemon: Support chroot builds on GNU/Hurd., guix-commits, 2023/11/29
- 13/13: HACK compile-as-derivation: build #:system "i586-gnu"., guix-commits, 2023/11/29
- 08/13: DRAFT hurd: Support second boot., guix-commits, 2023/11/29
- 07/13: system: hurd: Add swap-services to hurd-default-essential-services., guix-commits, 2023/11/29
- 05/13: hurd: Support system init in /libexec/runsystem., guix-commits, 2023/11/29
- 10/13: DRAFT system: examples: Add devel-hurd.tmpl., guix-commits, 2023/11/29
- 12/13: Revert "DRAFT daemon: Support chroot builds on GNU/Hurd.", guix-commits, 2023/11/29