guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit fa05235383a89f682f1c0a4b1570d328ff6abaf7 Author: Nicolas Graves <[email protected]> AuthorDate: Thu Feb 19 19:22:58 2026 +0100 gnu: hurd-core-headers-boot0: Drop input labels. * gnu/packages/commencement.scm (hurd-core-headers-boot0)[inputs]: Drop input labels. * gnu/packages/hurd.scm (hurd-core-headers): Adapt it. Change-Id: I8da6ff57ca9a3a6931fd304a43f770956d65159c Signed-off-by: Ludovic Courtès <[email protected]> --- gnu/packages/commencement.scm | 8 ++++---- gnu/packages/hurd.scm | 39 ++++++++++++++++++++++----------------- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 5f4c460cb97..b8fab38f760 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2828,10 +2828,10 @@ memoized as a function of '%current-system'." (arguments `(#:guile ,%bootstrap-guile ,@(package-arguments hurd-core-headers))) (inputs - `(("gnumach-headers" ,gnumach-headers-boot0) - ("hurd-headers" ,hurd-headers-boot0) - ("hurd-minimal" ,hurd-minimal-boot0) - ,@(%boot0-inputs))))) + (cons* gnumach-headers-boot0 + hurd-headers-boot0 + hurd-minimal-boot0 + (map cadr (%boot0-inputs)))))) (define* (kernel-headers-boot0 #:optional (system (%current-system))) (match system diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 2c767aeca38..db0e4ae1878 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -246,23 +246,28 @@ Library, Parted and netdde for GNU/Hurd.") (source #f) (build-system trivial-build-system) (arguments - '(#:modules ((guix build union)) - #:builder (begin - (use-modules (srfi srfi-1) - (srfi srfi-26) - (ice-9 match) - (guix build union)) - (let ((inputs (filter - (compose (cute member <> '("gnumach-headers" - "hurd-headers" - "hurd-minimal")) - car) - %build-inputs))) - (match inputs - (((names . directories) ...) - (union-build (assoc-ref %outputs "out") - directories) - #t)))))) + '(#:modules ((guix build union) + (guix build utils)) + #:builder + (begin + (use-modules (srfi srfi-1) + (ice-9 match) + (guix build union) + (guix build utils)) + + (union-build (assoc-ref %outputs "out") + (filter-map + (match-lambda + ((label . input) + (and (or (directory-exists? + (string-append input "/include/mach")) + (directory-exists? + (string-append input "/include/hurd"))) + ;; Avoid libc libraries. + (not (file-exists? + (string-append input "/include/locale.h"))) + input))) + %build-inputs))))) (inputs (list gnumach-headers hurd-headers hurd-minimal)) (supported-systems %hurd-systems) (synopsis "Union of the Hurd headers and libraries")
