From 9fc4e94986e68e0e33b260e2389765e2d3b7dd07 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 3 Mar 2021 12:27:18 +0100 Subject: gexp: #:references-graphs refers to non-native derivations. Fixes a regression introduced in c6d6aee6659acb293eb33f498fdac3b47a19a48, where #:reference-graphs would end up referring to native inputs. This would notably break the compilation of systems using a childhurd, because they would attempt to build the 'hurd' package natively. * guix/gexp.scm (lower-reference-graphs)[tuple->gexp-input]: Honor TARGET. * tests/gexp.scm ("gexp->derivation #:references-graphs cross-compilation"): New test. --- guix/gexp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'guix/gexp.scm') diff --git a/guix/gexp.scm b/guix/gexp.scm index 8cd44ba534..b72b8f4061 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -875,9 +875,9 @@ corresponding or store item." (define tuple->gexp-input (match-lambda ((thing) - (%gexp-input thing "out" #t)) + (%gexp-input thing "out" (not target))) ((thing output) - (%gexp-input thing output #t)))) + (%gexp-input thing output (not target))))) (match graphs (((file-names . inputs) ...) -- cgit v1.2.3