aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan (janneke) Nieuwenhuizen <janneke@gnu.org>2020-06-29 07:52:59 +0200
committerJan (janneke) Nieuwenhuizen <janneke@gnu.org>2020-06-30 15:16:09 +0200
commit26611f56fb1108de8205667fa9318b61794d0c9c (patch)
treea0c9ac4e478175e1684b5de6167fedb5fd30f066
parentb1c894b53fa86d39e7860da25852d6de84fe6801 (diff)
downloadguix-26611f56fb1108de8205667fa9318b61794d0c9c.tar.gz
guix-26611f56fb1108de8205667fa9318b61794d0c9c.zip
gnu: hurd-core-headers: Strictly include header packages.
* gnu/packages/hurd.scm (hurd-core-headers)[arguments]: Strictly include header package inputs in union.
-rw-r--r--gnu/packages/hurd.scm20
1 files changed, 14 insertions, 6 deletions
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index f0c4451e80..98fe594b7f 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -264,13 +264,21 @@ Library for GNU/Hurd.")
(arguments
'(#:modules ((guix build union))
#:builder (begin
- (use-modules (ice-9 match)
+ (use-modules (srfi srfi-1)
+ (srfi srfi-26)
+ (ice-9 match)
(guix build union))
- (match %build-inputs
- (((names . directories) ...)
- (union-build (assoc-ref %outputs "out")
- directories)
- #t)))))
+ (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))))))
(inputs `(("gnumach-headers" ,gnumach-headers)
("hurd-headers" ,hurd-headers)
("hurd-minimal" ,hurd-minimal)))