[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#50201] [PATCH 49/52] gnu: gdk-pixbuf: Find docbook when cross-compi
From: |
Maxime Devos |
Subject: |
[bug#50201] [PATCH 49/52] gnu: gdk-pixbuf: Find docbook when cross-compiling. |
Date: |
Wed, 25 Aug 2021 20:03:29 +0200 |
* gnu/packages/gtk.scm
(gdk-pixbuf)[arguments]<#:phases>{patch-docbook}: Look for docbook
in 'native-inputs' instead of 'inputs' when cross-compiling.
---
gnu/packages/gtk.scm | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 1d6be00e60..8bf55ccf14 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -628,15 +628,23 @@ highlighting and other features typical of a source code
editor.")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-docbook
- (lambda* (#:key inputs #:allow-other-keys)
+ ;; TODO(core-updates): Unconditionally look in (or native-inputs
inputs)
+ (lambda* (#:key ,@(if (%current-target-system)
+ '(native-inputs)
+ '())
+ inputs #:allow-other-keys)
(with-directory-excursion "docs"
(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/")))
(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/"))))
#t))
(add-before 'configure 'disable-failing-tests
--
2.33.0
- [bug#50201] [PATCH 47/52] gnu: wayland: Find docbook-xml when cross-compiling., (continued)
- [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
- [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 <=
- [bug#50201] [PATCH 45/52] gnu: Add pkg-config-for-build., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 34/52] gnu: libdaemon: Support cross-compilation to aarch64-linux-gnu., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH core-updates-frozen 0/52] Support cross-compilation in glib-or-gtk-build-system and fix cross-compilation errors, Mathieu Othacehe, 2021/08/28
- [bug#50201] [PATCH core-updates-frozen 0/52] Support cross-compilation in glib-or-gtk-build-system and fix cross-compilation errors, Maxime Devos, 2021/08/30