ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: texinfo: Cross-build fix.

Browse source 
* 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.
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2020-04-19 12:06:46 +02:00 committed by Jan Nieuwenhuizen
parent d64a6d267d
commit 95c14929a7
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gnu/packages/texinfo.scm
View file

@ -7,6 +7,7 @@
;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com> ;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -68,7 +69,11 @@ (define-public texinfo
"env ")) "env "))
#t)))) #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 ;; When cross-compiling, texinfo will build some of its own binaries with
;; the native compiler. This means ncurses is needed both in both inputs ;; the native compiler. This means ncurses is needed both in both inputs
;; and native-inputs. ;; and native-inputs.