[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/48: gnu: texinfo: Cross-build fix: Use host perl in host scripts.
From: |
guix-commits |
Subject: |
04/48: gnu: texinfo: Cross-build fix: Use host perl in host scripts. |
Date: |
Sun, 19 Apr 2020 10:22:06 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 9621aa6e2b80da4aa057eedb0e5279d2bb2b3e3d
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sun Apr 19 12:06:46 2020 +0200
gnu: texinfo: Cross-build fix: Use host perl in host scripts.
* gnu/packages/texinfo.scm (texinfo)[inputs]: When cross-compiling, add
perl.
This makes the host texi2any (makeinfo) refer to the correct perl.
---
gnu/packages/texinfo.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm
index 7457d99..e9d4a6f 100644
--- a/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2019 Pierre-Moana Levesque <address@hidden>
;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;; Copyright © 2020 Nicolas Goaziou <address@hidden>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -68,7 +69,10 @@
"env "))
#t))))
'()))
- (inputs `(("ncurses" ,ncurses)))
+ (inputs `(("ncurses" ,ncurses)
+ ,@(if (%current-target-system)
+ `(("perl" ,perl))
+ '())))
;; When cross-compiling, texinfo will build some of its own binaries with
;; the native compiler. This means ncurses is needed both in both inputs
;; and native-inputs.
- branch wip-hurd-vm created (now ba6bdb0), guix-commits, 2020/04/19
- 01/48: gnu: perl: Actually produce a host perl when cross-compiling., guix-commits, 2020/04/19
- 05/48: vm: Make the device node procedure a parameter., guix-commits, 2020/04/19
- 04/48: gnu: texinfo: Cross-build fix: Use host perl in host scripts.,
guix-commits <=
- 02/48: gnu: autoconf: Support cross-build., guix-commits, 2020/04/19
- 03/48: gnu: automake: Support cross-build., guix-commits, 2020/04/19
- 06/48: syscalls: 'readdir*' chooses between the Linux and Hurd code at run time., guix-commits, 2020/04/19
- 08/48: gnu: hurd: Fix references to /bin/w., guix-commits, 2020/04/19
- 11/48: gnu: Add dde-sources., guix-commits, 2020/04/19
- 13/48: gnu: hurd: Add NFS support., guix-commits, 2020/04/19
- 12/48: gnu: Add netdde., guix-commits, 2020/04/19
- 17/48: services: Add hurd-ttys-service-type., guix-commits, 2020/04/19
- 18/48: services: Add hurd-user-services-service-type., guix-commits, 2020/04/19
- 22/48: services: Add openssh-service as a Hurd service., guix-commits, 2020/04/19