[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/22: packages: '%standard-patch-inputs' is not influenced by '%current
From: |
guix-commits |
Subject: |
11/22: packages: '%standard-patch-inputs' is not influenced by '%current-target-system'. |
Date: |
Tue, 30 Mar 2021 17:00:16 -0400 (EDT) |
civodul pushed a commit to branch core-updates
in repository guix.
commit 83bdaf3150ba061739c53e82f68a595bf7b9744b
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 8b40c06..3d5c7fd 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -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))
- branch core-updates updated (cea364e -> 2eafeb2), guix-commits, 2021/03/30
- 01/22: gexp: Add 'with-build-variables'., guix-commits, 2021/03/30
- 02/22: gexp: Optimize 'with-build-variables'., guix-commits, 2021/03/30
- 13/22: packages: Call 'bag-grafts' only on the tip of the package graph., guix-commits, 2021/03/30
- 17/22: gnu: docbook-xsl: Move 'use-modules' form to the top level., guix-commits, 2021/03/30
- 15/22: gexp: Allowed/disallowed references and graphs never refer to grafted inputs., guix-commits, 2021/03/30
- 04/22: packages: Turn 'bag->derivation' into a monadic procedure., guix-commits, 2021/03/30
- 03/22: build-system: Rewrite using gexps., guix-commits, 2021/03/30
- 05/22: packages: Simplify patch instantiation., guix-commits, 2021/03/30
- 11/22: packages: '%standard-patch-inputs' is not influenced by '%current-target-system'.,
guix-commits <=
- 10/22: build-system: Use 'input-tuples->gexp' and 'outputs->gexp'., guix-commits, 2021/03/30
- 07/22: packages: Default origin 'patch-flags' is a gexp., guix-commits, 2021/03/30
- 12/22: packages: 'expand-input' accepts any file-like object., guix-commits, 2021/03/30
- 06/22: packages: Core procedures are written in monadic style., guix-commits, 2021/03/30
- 08/22: gexp: Add 'sexp->gexp'., guix-commits, 2021/03/30
- 18/22: gexp: 'imported+compiled-modules' fully honors #:guile., guix-commits, 2021/03/30
- 21/22: gnu: gnome-shell: Adjust to new #:disallowed-references convention., guix-commits, 2021/03/30
- 19/22: gexp: Add #:guile parameter to 'load-path-expression'., guix-commits, 2021/03/30
- 09/22: build-system: Use 'sexp->gexp' for plain sexps., guix-commits, 2021/03/30
- 14/22: grafts: Add 'without-grafting'., guix-commits, 2021/03/30