47/52: system: hurd: Ensure propagated inputs are also cross-built.

[guix-commits]

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

commit ccf7e65bbfdce9b5c8fc9ae81e09ae6cb8204c8f
Author: Ludovic Courtès <address@hidden>
AuthorDate: Wed Apr 8 23:23:06 2020 +0200

    system: hurd: Ensure propagated inputs are also cross-built.
    
    Previously, the propagated inputs of 'guix' would be the native
    GNU/Linux packages.
    
    * gnu/system/hurd.scm (cross-hurd-image)[cross-built]
    [cross-built-entry]: New procedures.
    [system-profile, grub.cfg]: Use it.
---
 gnu/system/hurd.scm | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index fd0a602..65b8c07 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -60,18 +60,23 @@
 (define* (cross-hurd-image #:key (hurd hurd) (gnumach gnumach))
   "Return a cross-built GNU/Hurd image."
 
+  (define (cross-built thing)
+    (with-parameters ((%current-target-system "i586-pc-gnu"))
+      thing))
+
+  (define (cross-built-entry entry)
+    (manifest-entry
+      (inherit entry)
+      (item (cross-built (manifest-entry-item entry)))
+      (dependencies (map cross-built-entry
+                         (manifest-entry-dependencies entry)))))
+
   (define system-profile
-    (map-manifest-entries
-     (lambda (entry)
-       (manifest-entry
-         (inherit entry)
-         (item (with-parameters ((%current-target-system "i586-pc-gnu"))
-                 (manifest-entry-item entry)))))
-     (packages->manifest %base-packages/hurd)))
+    (map-manifest-entries cross-built-entry
+                          (packages->manifest %base-packages/hurd)))
 
   (define grub.cfg
-    (let ((hurd (with-parameters ((%current-target-system "i586-pc-gnu"))
-                  hurd))
+    (let ((hurd (cross-built hurd))
           (mach (with-parameters ((%current-system "i686-linux"))
                   gnumach))
           (libc (cross-libc "i586-pc-gnu")))