me
/
guix
Archived
1
0
Fork 0
Code

gnu: guix: Phases refer to #:system, #:target, and #:native-inputs. 

* gnu/packages/package-management.scm (guix)[arguments]: In
'copy-bootstrap-guile' and 'wrap-program' phases, refer to #:system,
 #:native-inputs, and #:target instead of unquoting (%current-system)
and (%current-target-system).
master
Ludovic Courtès 2021-05-04 15:17:45 +02:00
parent c47f3fc135
commit af66a9510f
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/package-management.scm
View File

@ -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,8 @@ $(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 (assoc-ref (or native-inputs inputs)
"guile"))
(avahi (assoc-ref inputs "guile-avahi"))
(gcrypt (assoc-ref inputs "guile-gcrypt"))
(guile-lib (assoc-ref inputs "guile-lib"))
@ -318,9 +315,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 avahi (cons avahi deps) deps))
(effective
(read-line
(open-pipe* OPEN_READ