[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
49/52: gnu: gdk-pixbuf: Find docbook when cross-compiling.
From: |
guix-commits |
Subject: |
49/52: gnu: gdk-pixbuf: Find docbook when cross-compiling. |
Date: |
Mon, 20 Sep 2021 07:19:41 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates-frozen
in repository guix.
commit 26a336c20bd9f274c2117745828b514ceda18112
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Wed Aug 25 16:04:59 2021 +0200
gnu: gdk-pixbuf: Find docbook when cross-compiling.
* 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 6da70d4..017fd60 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
- 43/52: gnu: libxrandr: Add --disable-malloc0-returnsnull when necessary., (continued)
- 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
- 48/52: gnu: libproxy: Don't run tests when cross-compiling., guix-commits, 2021/09/20
- 51/52: gnu: pango: Add bash-minimal input when cross-compiling., guix-commits, 2021/09/20
- 33/52: gnu: libthai: Add datrie as native-input when cross-compiling., guix-commits, 2021/09/20
- 37/52: gnu: at-spi2-core: Don't cross-compile documentation., guix-commits, 2021/09/20
- 50/52: gnu: gdk-pixbuf: Add bash-minimal input when cross-compiling., guix-commits, 2021/09/20
- 49/52: gnu: gdk-pixbuf: Find docbook when cross-compiling.,
guix-commits <=
- 52/52: gnu: at-spi2-atk: Don't compile tests when cross-compiling., guix-commits, 2021/09/20
- 47/52: gnu: wayland: Find docbook-xml when cross-compiling., guix-commits, 2021/09/20
- 46/52: gnu: wayland: Find wayland-scanner when cross-compiling., guix-commits, 2021/09/20