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

[guix-commits]

civodul pushed a commit to branch wip-build-systems-gexp
in repository guix.

commit 3a20e37a7ee5718ebc82549ffd0917424c757976
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Mar 5 09:30:55 2021 +0100

    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.
---
 guix/packages.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/guix/packages.scm b/guix/packages.scm
index 2be9390..54a33c6 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -556,8 +556,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))