[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#50201] [PATCH 47/52] gnu: wayland: Find docbook-xml when cross-comp
From: |
Maxime Devos |
Subject: |
[bug#50201] [PATCH 47/52] gnu: wayland: Find docbook-xml when cross-compiling. |
Date: |
Wed, 25 Aug 2021 20:03:27 +0200 |
* gnu/packages/freedesktop.scm
(wayland)[arguments]<#:phases>{patchdocbook-xml}: Look in 'native-inputs'
instead of 'inputs' when cross-compiling.
---
gnu/packages/freedesktop.scm | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 9384ecd3f2..2e696f3848 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -979,14 +979,22 @@ Python.")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-docbook-xml
- (lambda* (#:key inputs #:allow-other-keys)
+ ;; TODO(core-updates): Use 'native-inputs' unconditionally
+ (lambda* (#:key ,@(if (%current-target-system)
+ '(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 inputs "docbook-xml")
+ (string-append (assoc-ref ,(if (%current-target-system)
+ '(or native-inputs inputs)
+ 'inputs) "docbook-xml")
"/xml/dtd/docbook/"))
(("http://www.oasis-open.org/docbook/xml/4\\.2/")
- (string-append (assoc-ref inputs "docbook-xml-4.2")
+ (string-append (assoc-ref ,(if (%current-target-system)
+ '(or native-inputs inputs)
+ 'inputs) "docbook-xml-4.2")
"/xml/dtd/docbook/"))))
#t))
(add-after 'install 'move-doc
--
2.33.0
- [bug#50201] [PATCH 29/52] gnu: json-glib: Add missing 'bash-minimal' input., (continued)
- [bug#50201] [PATCH 29/52] gnu: json-glib: Add missing 'bash-minimal' input., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 39/52] gnu: at-spi2-core: Add missing "bash-minimal" input., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 41/52] gnu: libxinerama: Add --disable-malloc0-returnsnull when necessary., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 40/52] gnu: xorg: Unify --disable-malloc0-returnsnull code., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 38/52] gnu: at-spi2-core: Find docbook when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 31/52] gnu: json-glib: Don't build gtk documentation when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 44/52] gnu: libxxf85vm: Add --disable-malloc0-returnsnull when necessary., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 46/52] gnu: wayland: Find wayland-scanner when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 48/52] gnu: libproxy: Don't run tests when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 42/52] gnu: libxi: Add --disable-malloc0-returnsnull when necessary., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 47/52] gnu: wayland: Find docbook-xml when cross-compiling.,
Maxime Devos <=
- [bug#50201] [PATCH 50/52] gnu: gdk-pixbuf: Add bash-minimal input when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 52/52] gnu: at-spi2-atk: Don't compile tests when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 33/52] gnu: libthai: Add datrie as native-input when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 43/52] gnu: libxrandr: Add --disable-malloc0-returnsnull when necessary., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 51/52] gnu: pango: Add bash-minimal input when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 37/52] gnu: at-spi2-core: Don't cross-compile documentation., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 35/52] gnu: avahi: Find 'TARGET-pkg-config' when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 32/52] gnu: json-glib: Don't build introspection data when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 36/52] gnu: avahi: Use the cross-compiled bash., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 49/52] gnu: gdk-pixbuf: Find docbook when cross-compiling., Maxime Devos, 2021/08/25