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

packages: '%standard-patch-inputs' is not influenced by '%current-target-system'. 

* guix/packages.scm (%standard-patch-inputs): Parameterize
%CURRENT-TARGET-SYSTEM around call to CANONICAL.
This commit is contained in:
Ludovic Courtès 2021-03-05 09:30:55 +01:00
parent 6cd591155c
commit 83bdaf3150
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
guix/packages.scm
View File

@ -563,8 +563,12 @@ identifiers. The result is inferred from the file names of patches."
(let* ((canonical (module-ref (resolve-interface '(gnu packages base))
'canonical-package))
(ref (lambda (module var)
(canonical
(module-ref (resolve-interface module) var)))))
;; Make sure 'canonical-package' is not influenced by
;; '%current-target-system' since we're going to use the
;; native package anyway.
(parameterize ((%current-target-system #f))
(canonical
(module-ref (resolve-interface module) var))))))
`(("tar" ,(ref '(gnu packages base) 'tar))
("xz" ,(ref '(gnu packages compression) 'xz))
("bzip2" ,(ref '(gnu packages compression) 'bzip2))