[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#48224] [PATCH 2/2] gnu: guix: Phases refer to #:system and #:target
From: |
Ludovic Courtès |
Subject: |
[bug#48224] [PATCH 2/2] gnu: guix: Phases refer to #:system and #:target. |
Date: |
Tue, 4 May 2021 15:39:58 +0200 |
* gnu/packages/package-management.scm (guix)[arguments]: In
'copy-bootstrap-guile' and 'wrap-program' phases, refer to #:system
and #:target instead of unquoting (%current-system)
and (%current-target-system).
---
gnu/packages/package-management.scm | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/package-management.scm
b/gnu/packages/package-management.scm
index 1a637f9ec8..5c6937adb8 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -261,11 +261,9 @@ $(prefix)/etc/openrc\n")))
(intern (assoc-ref inputs "boot-guile") #f)
;; On x86_64 some tests need the i686 Guile.
- ,@(if (and (not (%current-target-system))
- (string=? (%current-system)
- "x86_64-linux"))
- '((intern (assoc-ref inputs "boot-guile/i686")
#f))
- '())
+ (when (and (not target)
+ (string=? system "x86_64-linux"))
+ (intern (assoc-ref inputs "boot-guile/i686") #f))
;; Copy the bootstrap executables.
(for-each (lambda (input)
@@ -299,9 +297,9 @@ $(prefix)/etc/openrc\n")))
;; Make sure the 'guix' command finds GnuTLS,
;; Guile-JSON, and Guile-Git automatically.
(let* ((out (assoc-ref outputs "out"))
- (guile ,@(if (%current-target-system)
- '((assoc-ref native-inputs
"guile"))
- '((assoc-ref inputs "guile"))))
+ (guile (if target
+ (assoc-ref native-inputs "guile")
+ (assoc-ref inputs "guile")))
(avahi (assoc-ref inputs "guile-avahi"))
(gcrypt (assoc-ref inputs "guile-gcrypt"))
(guile-lib (assoc-ref inputs "guile-lib"))
@@ -318,9 +316,7 @@ $(prefix)/etc/openrc\n")))
(locales (assoc-ref inputs
"glibc-utf8-locales"))
(deps (list gcrypt json sqlite gnutls git
bs ssh zlib lzlib zstd guile-lib))
- (deps* ,@(if (%current-target-system)
- '(deps)
- '((cons avahi deps))))
+ (deps* (if target deps (cons avahi deps)))
(effective
(read-line
(open-pipe* OPEN_READ
--
2.31.1
- [bug#48224] [PATCH 0/2] Avoid Bash wrapper in 'guix' package, Ludovic Courtès, 2021/05/04
- [bug#48224] [PATCH 1/2] gnu: guix: Avoid Bash wrapper., Ludovic Courtès, 2021/05/04
- [bug#48224] [PATCH 2/2] gnu: guix: Phases refer to #:system and #:target.,
Ludovic Courtès <=
- [bug#48224] [PATCH 2/2] gnu: guix: Phases refer to #:system and #:target., Maxime Devos, 2021/05/04
- [bug#48224] [PATCH 0/2] Avoid Bash wrapper in 'guix' package, Ludovic Courtès, 2021/05/04
- [bug#48224] [PATCH 0/2] Avoid Bash wrapper in 'guix' package, Vagrant Cascadian, 2021/05/04
- [bug#48224] [PATCH 0/2] Avoid Bash wrapper in 'guix' package, Ludovic Courtès, 2021/05/09
- [bug#48224] [PATCH 0/2] Avoid Bash wrapper in 'guix' package, Vagrant Cascadian, 2021/05/12