[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/36: gnu: guix: Cross-build workaround: Run native guile for version.
From: |
guix-commits |
Subject: |
06/36: gnu: guix: Cross-build workaround: Run native guile for version. |
Date: |
Fri, 24 Apr 2020 08:14:06 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit bab0990d946298fa484e4a7f249ac218282003d6
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 4c55902..94003fa 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"))
- branch wip-hurd-vm created (now 6c9efcd), guix-commits, 2020/04/24
- 04/36: gnu: guix: Do not copy bootstrap-guile when cross-compiling., guix-commits, 2020/04/24
- 01/36: compile: Pre-load the compiler outside 'with-target'., guix-commits, 2020/04/24
- 09/36: gnu: guix: Cross-build fix: override compressors., guix-commits, 2020/04/24
- 07/36: gnu: guix: Cross-build fixup for wrap-program., guix-commits, 2020/04/24
- 05/36: gnu: guix: Indent `copy-bootstrap-guile' code., guix-commits, 2020/04/24
- 06/36: gnu: guix: Cross-build workaround: Run native guile for version.,
guix-commits <=
- 14/36: gnu: hurd: Use default Qemu guest ip: 10.0.2.15., guix-commits, 2020/04/24
- 10/36: gnu: guix: Run `make update-guix-package'., guix-commits, 2020/04/24
- 11/36: vm: Make the device node procedure a parameter., guix-commits, 2020/04/24
- 12/36: gnu: hurd: Build DDE libraries., guix-commits, 2020/04/24
- 17/36: gnu: hurd: Add NFS support., guix-commits, 2020/04/24
- 19/36: system: hurd: Add less, which to %base-packages/hurd., guix-commits, 2020/04/24
- 03/36: gnu: guix: Apply courage for the Hurd., guix-commits, 2020/04/24
- 15/36: gnu: Add dde-sources., guix-commits, 2020/04/24
- 16/36: gnu: Add netdde., guix-commits, 2020/04/24
- 13/36: gnu: hurd: Fix references to /bin/w., guix-commits, 2020/04/24