[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#50905] [PATCH core-updates v2 30/38] gnu: wayland: Unconditionally
From: |
Maxime Devos |
Subject: |
[bug#50905] [PATCH core-updates v2 30/38] gnu: wayland: Unconditionally lookup docbook in native-inputs. |
Date: |
Fri, 1 Oct 2021 16:21:32 +0200 |
* gnu/packages/freedesktop.scm
(wayland)[arguments]<#:phases>{patch-docbook-sgml}:
Unconditionally look in (or native-inputs inputs) for docbook-xml and
docbook-xml-4.2.
---
gnu/packages/freedesktop.scm | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 9bcf2d8d3e..0f04a38c00 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -975,22 +975,16 @@ Python.")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-docbook-xml
- ;; TODO(core-updates): Use 'native-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\\.5/")
- (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/"))
(("http://www.oasis-open.org/docbook/xml/4\\.2/")
- (string-append (assoc-ref ,(if (%current-target-system)
- '(or native-inputs inputs)
- 'inputs) "docbook-xml-4.2")
+ (string-append (assoc-ref (or native-inputs inputs)
+ "docbook-xml-4.2")
"/xml/dtd/docbook/"))))
#t))
(add-after 'install 'move-doc
--
2.33.0
- [bug#50905] [PATCH core-updates v2 15/38] gnu: libthai: Make 'datrie' input unconditional., (continued)
- [bug#50905] [PATCH core-updates v2 15/38] gnu: libthai: Make 'datrie' input unconditional., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 20/38] gnu: gdk-pixbuf: Use target predicates., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 18/38] gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 23/38] gnu: at-spi2-core: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 27/38] gnu: avahi: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 21/38] gnu: gdk-pixbuf: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 22/38] gnu: gdk-pixbuf: Remove trailing #t., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 24/38] gnu: at-spi2-core: Respect #:tests?., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 29/38] gnu: freedesktop: Unconditionally use alternatives to % variables., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 26/38] gnu: at-spi2-core: Remove trailing #t., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 30/38] gnu: wayland: Unconditionally lookup docbook in native-inputs.,
Maxime Devos <=
- [bug#50905] [PATCH core-updates v2 32/38] gnu: json-glib: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 37/38] build/qt-utils: Allow overriding the shell interpreter used., Maxime Devos, 2021/10/01
- bug#50905: [PATCH core-updates 00/38] Clean up TODO(core-updates), Mathieu Othacehe, 2021/10/02