[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/07: gnu: guix: Cross-build workaround: Run native guile for version.
From: |
guix-commits |
Subject: |
02/07: gnu: guix: Cross-build workaround: Run native guile for version. |
Date: |
Sun, 26 Apr 2020 15:07:02 -0400 (EDT) |
janneke pushed a commit to branch core-updates
in repository guix.
commit 56389433bcbbeb7abb94b4156957d2d2568ff36c
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 1b9697b..fdc570f 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -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"))
- branch core-updates updated (f589cbc -> d30d3e3), guix-commits, 2020/04/26
- 01/07: gnu: guix: Do not copy bootstrap-guile when cross-compiling., guix-commits, 2020/04/26
- 05/07: gnu: hurd: Build DDE libraries., guix-commits, 2020/04/26
- 04/07: gnu: guix: Update to 569c55bee2., guix-commits, 2020/04/26
- 02/07: gnu: guix: Cross-build workaround: Run native guile for version.,
guix-commits <=
- 03/07: gnu: guix: Cross-build fix: override compressors., guix-commits, 2020/04/26
- 07/07: gnu: Add netdde., guix-commits, 2020/04/26
- 06/07: gnu: Add dde-sources., guix-commits, 2020/04/26