From 6503b10bdc18d13d0aca76a9bf7cdb75a89e0adc Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 5 Jun 2020 10:31:43 +0200 Subject: gnu: info-reader: Remove perl reference. info-reader inherits from texinfo and uses substitute-keyword-arguments. If no phases are defined in texinfo, then phases won't be modified in info-reader. * gnu/packages/texinfo.scm (texinfo)[arguments]: Use %standard-phases when not cross-compiling so that substitute-keyword-arguments behaves as expected in inherited packages. --- gnu/packages/texinfo.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gnu/packages/texinfo.scm') diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 70e050371d..7dca37b51a 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2017, 2019 Efraim Flashner ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2019 Pierre-Moana Levesque -;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2019, 2020 Mathieu Othacehe ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; @@ -59,16 +59,16 @@ ;; with the native compiler, the environment is reset. This leads to ;; multiple environment variables missing. Do not reset the environment ;; to prevent that. - (if (%current-target-system) - '(#:phases - (modify-phases %standard-phases - (add-before 'configure 'fix-cross-configure - (lambda _ - (substitute* "configure" - (("env -i") - "env ")) - #t)))) - '())) + `(#:phases + (if ,(%current-target-system) + (modify-phases %standard-phases + (add-before 'configure 'fix-cross-configure + (lambda _ + (substitute* "configure" + (("env -i") + "env ")) + #t))) + %standard-phases))) (inputs `(("ncurses" ,ncurses) ;; TODO: remove `if' in the next rebuild cycle. ,@(if (%current-target-system) -- cgit 1.4.1