[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#50201] [PATCH 30/52] gnu: json-glib: Find docbook inputs when cross
From: |
Maxime Devos |
Subject: |
[bug#50201] [PATCH 30/52] gnu: json-glib: Find docbook inputs when cross-compiling. |
Date: |
Wed, 25 Aug 2021 20:03:10 +0200 |
* gnu/packages/gnome.scm (json-glib)[arguments]<#:phases>{patch-docbook}:
Look up "docbook-xml" in 'native-inputs', not 'inputs', when
cross-compiling.
---
gnu/packages/gnome.scm | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f0f3c0aeef..c0b6d010c7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4581,15 +4581,24 @@ configuration storage systems.")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-docbook
- (lambda* (#:key inputs #:allow-other-keys)
+ ;; TODO(core-updates): Use (or native-inputs 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\\.3/")
- (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/")))
(substitute* "meson.build"
(("http://docbook.sourceforge.net/release/xsl/current/")
- (string-append (assoc-ref inputs "docbook-xsl")
+ (string-append (assoc-ref ,(if (%current-target-system)
+ '(or native-inputs inputs)
+ 'inputs) "docbook-xsl")
"/xml/xsl/docbook-xsl-1.79.2/"))))
#t))
(add-after 'install 'move-docs
--
2.33.0
- [bug#50201] [PATCH 25/52] gnu: heimdal: Refer to cross-compiled bash., (continued)
- [bug#50201] [PATCH 25/52] gnu: heimdal: Refer to cross-compiled bash., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 16/52] gobject-introspection: Correct library name when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 11/52] build-system/glib-or-gtk: Support cross-compilaton., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 15/52] gobject-introspection: Fix inputs when cross-compiling., Maxime Devos, 2021/08/25
- [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 <=
- [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