[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#50905] [PATCH 31/38] gnu: json-glib: Unconditionally lookup docbook
From: |
Maxime Devos |
Subject: |
[bug#50905] [PATCH 31/38] gnu: json-glib: Unconditionally lookup docbook in native-inputs. |
Date: |
Thu, 30 Sep 2021 00:19:31 +0200 |
* gnu/packages/gnome.scm
(json-glib)[arguments]<#:phases>{patch-docbook}:
Unconditionally look in (or native-inputs inputs) for docbook-xml and
docbook-xsl.
---
gnu/packages/gnome.scm | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 497713cddc..57d9a9be79 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4607,24 +4607,17 @@ configuration storage systems.")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-docbook
- ;; TODO(core-updates): Use (or native-inputs inputs)
- ;; unconditionally.
- (lambda* (#:key ,@(if (%current-target-system)
- '(native-inputs)
- '()) inputs #:allow-other-keys)
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
(with-directory-excursion "doc"
(substitute* (find-files "." "\\.xml$")
(("http://www.oasis-open.org/docbook/xml/4\\.3/")
- (string-append (assoc-ref ,(if (%current-target-system)
- '(or native-inputs inputs)
- 'inputs)
+ (string-append (assoc-ref (or native-inputs inputs)
"docbook-xml")
"/xml/dtd/docbook/")))
(substitute* "meson.build"
(("http://docbook.sourceforge.net/release/xsl/current/")
- (string-append (assoc-ref ,(if (%current-target-system)
- '(or native-inputs inputs)
- 'inputs) "docbook-xsl")
+ (string-append (assoc-ref (or native-inputs inputs)
+ "docbook-xsl")
"/xml/xsl/docbook-xsl-1.79.2/"))))
#t))
;; When cross-compiling, there are no docs to move.
--
2.33.0
- [bug#50905] [PATCH 20/38] gnu: gdk-pixbuf: Use target predicates., (continued)
- [bug#50905] [PATCH 20/38] gnu: gdk-pixbuf: Use target predicates., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 21/38] gnu: gdk-pixbuf: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 26/38] gnu: at-spi2-core: Remove trailing #t., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 27/38] gnu: avahi: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 14/38] gnu: cairo: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 15/38] gnu: libthai: Make 'datrie' input unconditional., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 18/38] gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 25/38] gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 24/38] gnu: at-spi2-core: Respect #:tests?., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 22/38] gnu: gdk-pixbuf: Remove trailing #t., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 31/38] gnu: json-glib: Unconditionally lookup docbook in native-inputs.,
Maxime Devos <=
- [bug#50905] [PATCH 34/38] gnu: heimdal: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 36/38] gnu: libproxy: Respect #:tests?., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 37/38] build/qt-utils: Allow overriding the shell interpreter used., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 19/38] gnu: gdk-pixbuf: Respect #:tests?., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 28/38] gnu: avahi: Make the 'patch-more-shebangs' phase unconditional., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 32/38] gnu: json-glib: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 35/38] gnu: libcap: Unconditionally use #$output., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 13/38] gnu: gobject-introspection: Use python instead of python-wrapper., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 38/38] lint: check-wrapper-inputs: Remove mentions of core-updates., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 23/38] gnu: at-spi2-core: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/09/29