[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#50905] [PATCH 18/38] gnu: gdk-pixbuf: Unconditionally lookup docboo
From: |
Maxime Devos |
Subject: |
[bug#50905] [PATCH 18/38] gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs. |
Date: |
Thu, 30 Sep 2021 00:19:18 +0200 |
* gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>{patch-docbook}:
Unconditionally look in (or native-inputs inputs) for docbook-xsl and
docbook-xml.
---
gnu/packages/gtk.scm | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 4f8b87ea48..fd7feab69b 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -623,23 +623,17 @@ highlighting and other features typical of a source code
editor.")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-docbook
- ;; TODO(core-updates): Unconditionally look in (or native-inputs
inputs)
- (lambda* (#:key ,@(if (%current-target-system)
- '(native-inputs)
- '())
- inputs #:allow-other-keys)
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
(with-directory-excursion "docs"
(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/")))
(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) "docbook-xml")
+ (string-append (assoc-ref (or native-inputs inputs)
+ "docbook-xml")
"/xml/dtd/docbook/"))))
#t))
(add-before 'configure 'disable-failing-tests
--
2.33.0
- [bug#50905] [PATCH 07/38] gnu: mozjs: Make the quasiquote unconditional., (continued)
- [bug#50905] [PATCH 07/38] gnu: mozjs: Make the quasiquote unconditional., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 06/38] gnu: mozjs: Make the native-inputs unconditional., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 16/38] gnu: libdatrie: Make input labels match the package name., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 11/38] gnu: isc-dhcp: Remove trailing #t., Maxime Devos, 2021/09/29
- [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 <=
- [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, 2021/09/29
- [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