[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/44: gnu: texinfo: Cross-build fix: Use host perl in host scripts.
From: |
guix-commits |
Subject: |
03/44: gnu: texinfo: Cross-build fix: Use host perl in host scripts. |
Date: |
Tue, 21 Apr 2020 15:48:19 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit b8c57f5d200e6571ec4d514892fcc059e07ae016
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 | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm
index 7457d99..70e0503 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,11 @@
"env "))
#t))))
'()))
- (inputs `(("ncurses" ,ncurses)))
+ (inputs `(("ncurses" ,ncurses)
+ ;; TODO: remove `if' in the next rebuild cycle.
+ ,@(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 2c35684), guix-commits, 2020/04/21
- 01/44: gnu: autoconf: Support cross-build., guix-commits, 2020/04/21
- 05/44: vm: Make the device node procedure a parameter., guix-commits, 2020/04/21
- 04/44: tests: Update expected values for package->code., guix-commits, 2020/04/21
- 09/44: gnu: Add dde-sources., guix-commits, 2020/04/21
- 02/44: gnu: automake: Support cross-build., guix-commits, 2020/04/21
- 03/44: gnu: texinfo: Cross-build fix: Use host perl in host scripts.,
guix-commits <=
- 06/44: gnu: hurd: Build DDE libraries., guix-commits, 2020/04/21
- 10/44: gnu: Add netdde., guix-commits, 2020/04/21
- 16/44: services: Add hurd-console-service-type., guix-commits, 2020/04/21
- 15/44: services: Add hurd., guix-commits, 2020/04/21
- 14/44: system: hurd: Add /etc/group., guix-commits, 2020/04/21
- 11/44: gnu: hurd: Add NFS support., guix-commits, 2020/04/21
- 18/44: services: Add hurd-user-services-service-type., guix-commits, 2020/04/21
- 22/44: services: Add openssh-service as a Hurd service., guix-commits, 2020/04/21
- 21/44: services: hurd: Add dummy loopback., guix-commits, 2020/04/21
- 19/44: services: Add guix-daemon-service as a Hurd service., guix-commits, 2020/04/21