me
/
guix
Archived
1
0
Fork 0
Code

gnu: guix: Cross-build workaround: Run native guile for version. 

We need to take some care here, the native guile is not necessarily always the
same version as the host guile.

* gnu/packages/package-management.scm (guix)[arguments]: Do not attempt to run
host guile for getting effective-version; resort to native guile.
master
Jan (janneke) Nieuwenhuizen 2020-04-24 11:21:48 +02:00 committed by Jan Nieuwenhuizen
parent d653e184ec
commit 56389433bc
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,11 +245,13 @@ $(prefix)/etc/init.d\n")))
(setenv "SHELL" (which "sh"))
#t))
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
(lambda* (#:key inputs native-inputs outputs #:allow-other-keys)
;; Make sure the 'guix' command finds GnuTLS,
;; Guile-JSON, and Guile-Git automatically.
(let* ((out (assoc-ref outputs "out"))
(guile (assoc-ref inputs "guile"))
(guile ,@(if (%current-target-system)
'((assoc-ref native-inputs "guile"))
'((assoc-ref inputs "guile"))))
(gcrypt (assoc-ref inputs "guile-gcrypt"))
(json (assoc-ref inputs "guile-json"))
(sqlite (assoc-ref inputs "guile-sqlite3"))