futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: info-reader: Remove perl reference.

Browse Source 
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.
This commit is contained in:
Mathieu Othacehe 2020-06-05 10:31:43 +02:00
parent 11ae7e9e45
commit 6503b10bdc
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/texinfo.scm
View File

@ -5,7 +5,7 @@
;;; Copyright © 2017, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; 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, 2020 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> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
@ -59,16 +59,16 @@
;; with the native compiler, the environment is reset. This leads to ;; with the native compiler, the environment is reset. This leads to
;; multiple environment variables missing. Do not reset the environment ;; multiple environment variables missing. Do not reset the environment
;; to prevent that. ;; to prevent that.
(if (%current-target-system) `(#:phases
'(#:phases (if ,(%current-target-system)
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'fix-cross-configure (add-before 'configure 'fix-cross-configure
(lambda _ (lambda _
(substitute* "configure" (substitute* "configure"
(("env -i") (("env -i")
"env ")) "env "))
#t)))) #t)))
'())) %standard-phases)))
(inputs `(("ncurses" ,ncurses) (inputs `(("ncurses" ,ncurses)
;; TODO: remove `if' in the next rebuild cycle. ;; TODO: remove `if' in the next rebuild cycle.
,@(if (%current-target-system) ,@(if (%current-target-system)