From 95c14929a7fbd3c55c5e8756953c2f257625e2b7 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 19 Apr 2020 12:06:46 +0200 Subject: gnu: texinfo: Cross-build fix. * gnu/packages/texinfo.scm (texinfo)[inputs]: Add perl. This makes the host texi2any (makeinfo) refer to the correct perl. To avoid triggering a rebuild, do this while cross-compiling only. --- gnu/packages/texinfo.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 7457d99653..70e050371d 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019 Pierre-Moana Levesque ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -68,7 +69,11 @@ (define-public texinfo "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. -- cgit v1.2.3