From 2248828c058fcc718ddb614635622994ab63d089 Mon Sep 17 00:00:00 2001
From: Rutherther <rutherther@ditigal.xyz>
Date: Thu, 31 Jul 2025 19:50:38 +0200
Subject: [PATCH] fix: respect host-system for native-inputs and target-inputs

---
 modules/cross-shells/cross-profile.scm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/modules/cross-shells/cross-profile.scm b/modules/cross-shells/cross-profile.scm
index 6b33385dc3f117a8c35706180e93d3832f064594..93bd8cd22e10eacd4cb562f000750ce79cf3ac69 100644
--- a/modules/cross-shells/cross-profile.scm
+++ b/modules/cross-shells/cross-profile.scm
@@ -174,7 +174,13 @@
                          (guix build utils)
                          (guix build union))
                         (let ((inputs-paths
-                               (list #$@(collect-cross-profile-target-inputs cross-profile)
+                               (list #$@(map
+                                         (lambda (package)
+                                           (cross-package-job
+                                            (package package)
+                                            (system host-system)
+                                            (target #f)))
+                                         (collect-cross-profile-target-inputs cross-profile))
                                      #$@(map (lambda (package)
                                                (cross-package-job
                                                 (package package)
@@ -184,7 +190,13 @@
                               (cross-profile-path
                                (string-append #$output "/cross/" #$(or target-system "native") "/" #$cross-profile-name))
                               (native-inputs-paths
-                               (list #$@(collect-cross-profile-native-inputs cross-profile))))
+                               (list #$@(map
+                                         (lambda (package)
+                                           (cross-package-job
+                                            (package package)
+                                            (system host-system)
+                                            (target #f)))
+                                         (collect-cross-profile-native-inputs cross-profile)))))
 
                           (union-build #$output native-inputs-paths)
                           (mkdir-p (dirname cross-profile-path))