[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#50201] [PATCH 38/52] gnu: at-spi2-core: Find docbook when cross-com
From: |
Maxime Devos |
Subject: |
[bug#50201] [PATCH 38/52] gnu: at-spi2-core: Find docbook when cross-compiling. |
Date: |
Wed, 25 Aug 2021 20:03:18 +0200 |
* gnu/packages/gtk.scm
(at-spi2-core)[arguments]<#:phases>{patch-docbook-sgml}: Look up
"docbook-sxml" in 'native-inputs' instead of 'inputs' when cross-compiling.
---
gnu/packages/gtk.scm | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 73b805f6fe..49208716eb 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -744,10 +744,17 @@ scaled, composited, modified, saved, or rendered.")
(lambda* (#:key outputs #:allow-other-keys)
(mkdir-p (string-append (assoc-ref outputs "doc") "/share"))
#t))
+ ;; TODO(core-updates): Unconditionally use (or native-inputs inputs)
(add-after 'unpack 'patch-docbook-sgml
- (lambda* (#:key inputs #:allow-other-keys)
- (let* ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
- "/xml/dtd/docbook")))
+ (lambda* (#:key ,@(if (%current-target-system)
+ '(native-inputs)
+ '()) inputs #:allow-other-keys)
+ (let* ((xmldoc
+ (string-append (assoc-ref ,(if (%current-target-system)
+ '(or native-inputs inputs)
+ 'inputs)
+ "docbook-xml")
+ "/xml/dtd/docbook")))
(substitute* "doc/libatspi/libatspi-docs.sgml"
(("http://.*/docbookx\\.dtd")
(string-append xmldoc "/docbookx.dtd")))
--
2.33.0
- [bug#50201] [PATCH 21/52] gnu: gamin: Fix 'configure' script when cross-compiling., (continued)
- [bug#50201] [PATCH 21/52] gnu: gamin: Fix 'configure' script when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 24/52] gnu: heimdal: Fix linking error when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 28/52] gnu: heimdal: Use libcom_err from input when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 26/52] gnu: heimdal: Use the cross-compiled bash in "su"., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 27/52] gnu: heimdal: Find tools when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 30/52] gnu: json-glib: Find docbook inputs when cross-compiling., Maxime Devos, 2021/08/25
- [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 <=
- [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, 2021/08/25
- [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