[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#50905] [PATCH core-updates v2 31/38] gnu: json-glib: Unconditionall
From: |
Maxime Devos |
Subject: |
[bug#50905] [PATCH core-updates v2 31/38] gnu: json-glib: Unconditionally lookup docbook in native-inputs. |
Date: |
Fri, 1 Oct 2021 16:21:33 +0200 |
* gnu/packages/gnome.scm
(json-glib)[arguments]<#:phases>{patch-docbook}:
Unconditionally look in (or native-inputs inputs) for docbook-xml and
docbook-xsl.
---
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 497713cddc..57d9a9be79 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.
--
2.33.0
- [bug#50905] [PATCH core-updates v2 08/38] gnu: isc-dhcp: Don't use canonical-package., (continued)
- [bug#50905] [PATCH core-updates v2 08/38] gnu: isc-dhcp: Don't use canonical-package., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 04/38] gnu: icecat: Use mozilla-build-system., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 06/38] gnu: mozjs: Make the native-inputs unconditional., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 16/38] gnu: libdatrie: Make input labels match the package name., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 02/38] gnu: nspr: Use mozilla-build-system., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 13/38] gnu: gobject-introspection: Use python instead of python-wrapper., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 11/38] gnu: isc-dhcp: Remove trailing #t., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 12/38] gnu: gobject-introspection: Move things to native-inputs., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 09/38] gnu: isc-dhcp: Make an input unconditional., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 19/38] gnu: gdk-pixbuf: Respect #:tests?., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 31/38] gnu: json-glib: Unconditionally lookup docbook in native-inputs.,
Maxime Devos <=
- [bug#50905] [PATCH core-updates v2 17/38] gnu: pango: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 34/38] gnu: heimdal: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 38/38] lint: check-wrapper-inputs: Remove mentions of core-updates., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 36/38] gnu: libproxy: Respect #:tests?., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 33/38] gnu: heimdal: Make some parts of phases unconditional., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 03/38] gnu: mozjs: Use mozilla-build-system., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 25/38] gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 35/38] gnu: libcap: Unconditionally use #$output., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 07/38] gnu: mozjs: Make the quasiquote unconditional., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 10/38] gnu: isc-dhcp: Remove unnecessary shebang patching., Maxime Devos, 2021/10/01