[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/09: packages: Honor target system for the inputs to ‘patch-and-repack
From: |
guix-commits |
Subject: |
02/09: packages: Honor target system for the inputs to ‘patch-and-repack’. |
Date: |
Sun, 3 Dec 2023 17:58:42 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 2447c1b6083290449f1bffd1e5953dd3d0820de9
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun Dec 3 00:50:40 2023 +0100
packages: Honor target system for the inputs to ‘patch-and-repack’.
* guix/packages.scm (%standard-patch-inputs): Add ‘system’ parameter.
Parameterize ‘%current-system’.
(patch-and-repack): Pass SYSTEM to ‘%standard-patch-inputs’.
Change-Id: Ic8ad93303332fd1eefba0a93a314f99db782eda6
---
guix/packages.scm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/guix/packages.scm b/guix/packages.scm
index b768dddb5f..930b1a3b0e 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -849,14 +849,15 @@ identifiers. The result is inferred from the file names
of patches."
'()))))
(append-map patch-vulnerabilities patches)))
-(define (%standard-patch-inputs)
+(define (%standard-patch-inputs system)
(let* ((canonical (module-ref (resolve-interface '(gnu packages base))
'canonical-package))
(ref (lambda (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))
+ (parameterize ((%current-target-system #f)
+ (%current-system system))
(canonical
(module-ref (resolve-interface module) var))))))
`(("tar" ,(ref '(gnu packages base) 'tar))
@@ -867,7 +868,8 @@ identifiers. The result is inferred from the file names of
patches."
("unzip" ,(ref '(gnu packages compression) 'unzip))
("patch" ,(ref '(gnu packages base) 'patch))
("locales"
- ,(parameterize ((%current-target-system #f))
+ ,(parameterize ((%current-target-system #f)
+ (%current-system system))
(canonical
((module-ref (resolve-interface '(gnu packages base))
'libc-utf8-locales-for-target))))))))
@@ -913,7 +915,7 @@ specifies modules in scope when evaluating SNIPPET."
(define lookup-input
;; The default value of the 'patch-inputs' field, and thus INPUTS is #f,
;; so deal with that.
- (let ((inputs (or inputs (%standard-patch-inputs))))
+ (let ((inputs (or inputs (%standard-patch-inputs system))))
(lambda (name)
(match (assoc-ref inputs name)
((package) package)
- branch master updated (ab8612d99e -> 6e2dd51df5), guix-commits, 2023/12/03
- 07/09: gnu: kpackage: Work around flaky test., guix-commits, 2023/12/03
- 08/09: gnu: gmnisrv: Fix typo., guix-commits, 2023/12/03
- 09/09: gnu: xpra: Update to 5.0.4., guix-commits, 2023/12/03
- 02/09: packages: Honor target system for the inputs to ‘patch-and-repack’.,
guix-commits <=
- 01/09: grafts: Use the right locale package., guix-commits, 2023/12/03
- 03/09: gnu: igt-gpu-tools: Update to 1.28, guix-commits, 2023/12/03
- 06/09: gnu: xe: Update to 1.0., guix-commits, 2023/12/03
- 05/09: gnu: xonsh: Update to 0.14.2., guix-commits, 2023/12/03
- 04/09: gnu: Add python-islenska., guix-commits, 2023/12/03