[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
31/38: gnu: json-glib: Unconditionally lookup docbook in native-inputs.
From: |
guix-commits |
Subject: |
31/38: gnu: json-glib: Unconditionally lookup docbook in native-inputs. |
Date: |
Sat, 2 Oct 2021 12:52:45 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit 97cd9b73a612bb6401202187f647caafc4b593c6
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Fri Oct 1 16:21:33 2021 +0200
gnu: json-glib: Unconditionally lookup docbook in native-inputs.
* gnu/packages/gnome.scm
(json-glib)[arguments]<#:phases>{patch-docbook}:
Unconditionally look in (or native-inputs inputs) for docbook-xml and
docbook-xsl.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
gnu/packages/gnome.scm | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 497713c..57d9a9b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4607,24 +4607,17 @@ configuration storage systems.")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-docbook
- ;; TODO(core-updates): Use (or native-inputs inputs)
- ;; unconditionally.
- (lambda* (#:key ,@(if (%current-target-system)
- '(native-inputs)
- '()) inputs #:allow-other-keys)
+ (lambda* (#:key 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 ,(if (%current-target-system)
- '(or native-inputs inputs)
- 'inputs)
+ (string-append (assoc-ref (or native-inputs inputs)
"docbook-xml")
"/xml/dtd/docbook/")))
(substitute* "meson.build"
(("http://docbook.sourceforge.net/release/xsl/current/")
- (string-append (assoc-ref ,(if (%current-target-system)
- '(or native-inputs inputs)
- 'inputs) "docbook-xsl")
+ (string-append (assoc-ref (or native-inputs inputs)
+ "docbook-xsl")
"/xml/xsl/docbook-xsl-1.79.2/"))))
#t))
;; When cross-compiling, there are no docs to move.
- 18/38: gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs., (continued)
- 18/38: gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs., guix-commits, 2021/10/02
- 22/38: gnu: gdk-pixbuf: Remove trailing #t., guix-commits, 2021/10/02
- 25/38: gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs., guix-commits, 2021/10/02
- 12/38: gnu: gobject-introspection: Move things to native-inputs., guix-commits, 2021/10/02
- 19/38: gnu: gdk-pixbuf: Respect #:tests?., guix-commits, 2021/10/02
- 24/38: gnu: at-spi2-core: Respect #:tests?., guix-commits, 2021/10/02
- 32/38: gnu: json-glib: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 34/38: gnu: heimdal: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 38/38: lint: check-wrapper-inputs: Remove mentions of core-updates., guix-commits, 2021/10/02
- 37/38: build/qt-utils: Allow overriding the shell interpreter used., guix-commits, 2021/10/02
- 31/38: gnu: json-glib: Unconditionally lookup docbook in native-inputs.,
guix-commits <=
- 33/38: gnu: heimdal: Make some parts of phases unconditional., guix-commits, 2021/10/02
- 35/38: gnu: libcap: Unconditionally use #$output., guix-commits, 2021/10/02
- 36/38: gnu: libproxy: Respect #:tests?., guix-commits, 2021/10/02