(address . guix-patches@gnu.org)(name . Daniel [REDACTED])(address . pjals@privacyrequired.com)
20241108144504.5263-2-pjals@privacyrequired.com
From: "Daniel [REDACTED]" <pjals@privacyrequired.com>
* guix/packages.scm (bag-transitive-inputs): Set %current-target-system while
finding bag transitive inputs.
Change-Id: If33a0fc2bf038e09819c87f535c27dfe5e873973
---
guix/packages.scm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
Toggle diff (34 lines)
diff --git a/guix/packages.scm b/guix/packages.scm
index f373136d22..40d5e7b1d5 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -1443,12 +1443,6 @@ (define (bag-direct-inputs bag)
(bag-host-inputs bag)
(bag-target-inputs bag)))
-(define (bag-transitive-inputs bag)
- "Same as 'package-transitive-inputs', but applied to a bag."
- (parameterize ((%current-target-system #f)
- (%current-system (bag-system bag)))
- (transitive-inputs (bag-direct-inputs bag))))
-
(define (bag-transitive-build-inputs bag)
"Same as 'package-transitive-native-inputs', but applied to a bag."
(parameterize ((%current-target-system #f)
@@ -1467,6 +1461,12 @@ (define (bag-transitive-target-inputs bag)
(%current-system (bag-system bag)))
(transitive-inputs (bag-target-inputs bag))))
+(define (bag-transitive-inputs bag)
+ "Same as 'package-transitive-inputs', but applied to a bag."
+ (append (bag-transitive-build-inputs bag)
+ (bag-transitive-host-inputs bag)
+ (bag-transitive-target-inputs bag)))
+
(define* (package-development-inputs package
#:optional (system (%current-system))
#:key target)
base-commit: 2a6d96425eea57dc6dd48a2bec16743046e32e06
--
2.46.0