TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

build-system/gnu: Cross builds properly handle #:allowed-references & co.

Browse source 
Fixes <https://bugs.gnu.org/41775>.

* guix/build-system/gnu.scm (gnu-cross-build)[canonicalize-reference]:
Pass TARGET and SYSTEM to 'package-cross-derivation'.
This commit is contained in:
Ludovic Courtès 2020-06-20 22:56:08 +02:00
parent 8562124862
commit 50e7e6a065
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
guix/build-system/gnu.scm
View file

@ -513,9 +513,11 @@ (define* (gnu-cross-build store name
(define canonicalize-reference (define canonicalize-reference
(match-lambda (match-lambda
((? package? p) ((? package? p)
(derivation->output-path (package-cross-derivation store p system))) (derivation->output-path (package-cross-derivation store p
target system)))
(((? package? p) output) (((? package? p) output)
(derivation->output-path (package-cross-derivation store p system) (derivation->output-path (package-cross-derivation store p
target system)
output)) output))
((? string? output) ((? string? output)
output))) output)))