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

[guix-commits]

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

commit 4c7c89f97a0d49bc678251bf3ab452dcab85522a
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Fri Apr 24 11:21:48 2020 +0200

    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.
---
 gnu/packages/package-management.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index 52092df..0dc5b10 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -247,11 +247,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"))