[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/06: packages: '%standard-patch-inputs' is not influenced by '%current
From: |
guix-commits |
Subject: |
02/06: packages: '%standard-patch-inputs' is not influenced by '%current-target-system'. |
Date: |
Fri, 5 Mar 2021 05:46:44 -0500 (EST) |
civodul pushed a commit to branch wip-build-systems-gexp
in repository guix.
commit c58a4f628dd7f1bcd175fbdebcca0a8c8ff02ab2
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 e182e0b..22e792e 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))
- branch wip-build-systems-gexp updated (b1da83b -> 063beaa), guix-commits, 2021/03/05
- 01/06: gexp: Honor #:target in 'compiled-modules'., guix-commits, 2021/03/05
- 03/06: download: 'url-fetch/tarbomb' and 'url-fetch/zipbomb' refer to native tools., guix-commits, 2021/03/05
- 02/06: packages: '%standard-patch-inputs' is not influenced by '%current-target-system'.,
guix-commits <=
- 05/06: squash! build-system: Rewrite using gexps, guix-commits, 2021/03/05
- 06/06: tests: Refer to '%derivation-cache' in the right module., guix-commits, 2021/03/05
- 04/06: squash! packages: Core procedures are written in monadic style., guix-commits, 2021/03/05