summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-06-20 22:56:08 +0200
committerLudovic Courtès <ludo@gnu.org>2020-06-20 23:35:58 +0200
commit50e7e6a065dbf463aa7f56e852f4bc8aab55c4a6 (patch)
tree02e8a5311053a2666720cf886f4917c7ca3bec39
parentgnu: Mutt: Update to 1.14.4. (diff)
downloadguix-50e7e6a065dbf463aa7f56e852f4bc8aab55c4a6.tar.gz
guix-50e7e6a065dbf463aa7f56e852f4bc8aab55c4a6.tar.bz2
guix-50e7e6a065dbf463aa7f56e852f4bc8aab55c4a6.tar.xz
build-system/gnu: Cross builds properly handle #:allowed-references & co.
Fixes <https://bugs.gnu.org/41775>. * guix/build-system/gnu.scm (gnu-cross-build)[canonicalize-reference]: Pass TARGET and SYSTEM to 'package-cross-derivation'.
-rw-r--r--guix/build-system/gnu.scm6
1 files changed, 4 insertions, 2 deletions
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index 60851c5..6b481ad 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -513,9 +513,11 @@ platform."
513 (define canonicalize-reference 513 (define canonicalize-reference
514 (match-lambda 514 (match-lambda
515 ((? package? p) 515 ((? package? p)
516 (derivation->output-path (package-cross-derivation store p system))) 516 (derivation->output-path (package-cross-derivation store p
517 target system)))
517 (((? package? p) output) 518 (((? package? p) output)
518 (derivation->output-path (package-cross-derivation store p system) 519 (derivation->output-path (package-cross-derivation store p
520 target system)
519 output)) 521 output))
520 ((? string? output) 522 ((? string? output)
521 output))) 523 output)))