[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
30/52: gnu: json-glib: Find docbook inputs when cross-compiling.
|
From: |
guix-commits |
|
Subject: |
30/52: gnu: json-glib: Find docbook inputs when cross-compiling. |
|
Date: |
Mon, 20 Sep 2021 07:19:35 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates-frozen
in repository guix.
commit d0cf033661610ee1e8e728dad8710b85a428f2e3
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Wed Aug 25 10:50:38 2021 +0200
gnu: json-glib: Find docbook inputs when cross-compiling.
* 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 b66456d..fbf3677 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4599,15 +4599,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
- 03/52: gnu: elogind: Fix cross-compilation., (continued)
- 03/52: gnu: elogind: Fix cross-compilation., guix-commits, 2021/09/20
- 04/52: gnu: libcap: Fix cross-compilation build failures., guix-commits, 2021/09/20
- 05/52: gnu: perl: Find 'bash' when cross-compiling., guix-commits, 2021/09/20
- 08/52: gnu: mozjs-60: Fix cross-compilation build errors., guix-commits, 2021/09/20
- 10/52: build-system/meson: Allow 'configure-flags' to be a G-exp., guix-commits, 2021/09/20
- 22/52: gnu: iso-codes: Move inputs to native-inputs when cross-compiling., guix-commits, 2021/09/20
- 14/52: gnu: gobject-introspection: Don't build introspection data when cross-compiling., guix-commits, 2021/09/20
- 20/52: gnu: gamin: Recognise aarch64 as architecture when cross-compiling., guix-commits, 2021/09/20
- 26/52: gnu: heimdal: Use the cross-compiled bash in "su"., guix-commits, 2021/09/20
- 29/52: gnu: json-glib: Add missing 'bash-minimal' input., guix-commits, 2021/09/20
- 30/52: gnu: json-glib: Find docbook inputs when cross-compiling.,
guix-commits <=
- 31/52: gnu: json-glib: Don't build gtk documentation when cross-compiling., guix-commits, 2021/09/20
- 36/52: gnu: avahi: Use the cross-compiled bash., guix-commits, 2021/09/20
- 38/52: gnu: at-spi2-core: Find docbook when cross-compiling., guix-commits, 2021/09/20
- 44/52: gnu: libxxf85vm: Add --disable-malloc0-returnsnull when necessary., guix-commits, 2021/09/20
- 41/52: gnu: libxinerama: Add --disable-malloc0-returnsnull when necessary., guix-commits, 2021/09/20
- 43/52: gnu: libxrandr: Add --disable-malloc0-returnsnull when necessary., guix-commits, 2021/09/20
- 39/52: gnu: at-spi2-core: Add missing "bash-minimal" input., guix-commits, 2021/09/20
- 40/52: gnu: xorg: Unify --disable-malloc0-returnsnull code., guix-commits, 2021/09/20
- 42/52: gnu: libxi: Add --disable-malloc0-returnsnull when necessary., guix-commits, 2021/09/20
- 45/52: gnu: Add pkg-config-for-build., guix-commits, 2021/09/20