[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: info-reader: Remove perl reference.
From: |
guix-commits |
Subject: |
01/02: gnu: info-reader: Remove perl reference. |
Date: |
Fri, 5 Jun 2020 15:13:32 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit 6503b10bdc18d13d0aca76a9bf7cdb75a89e0adc
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Fri Jun 5 10:31:43 2020 +0200
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(-)
diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm
index 70e0503..7dca37b 100644
--- a/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@ -5,7 +5,7 @@
;;; Copyright © 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; 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 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;;
@@ -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)