guix-commits
[Top][All Lists]
Advanced

[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.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]