From: Maxime Devos <maximedevos@telenet.be>
To: 50905@debbugs.gnu.org
Cc: Maxime Devos <maximedevos@telenet.be>
Subject: [bug#50905] [PATCH 31/38] gnu: json-glib: Unconditionally lookup docbook in native-inputs.
Date: Thu, 30 Sep 2021 00:19:31 +0200 [thread overview]
Message-ID: <20210929221938.17168-31-maximedevos@telenet.be> (raw)
In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be>
* 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
next prev parent reply other threads:[~2021-09-29 22:22 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-29 22:18 [bug#50905] [PATCH core-updates 00/38] Clean up TODO(core-updates) Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 01/38] build-system/mozilla: New build system Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 02/38] gnu: nspr: Use mozilla-build-system Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 03/38] gnu: mozjs: " Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 04/38] gnu: icecat: " Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 05/38] build/minetest-build-system: Move png-file? to (guix build utils) Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 06/38] gnu: mozjs: Make the native-inputs unconditional Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 07/38] gnu: mozjs: Make the quasiquote unconditional Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 08/38] gnu: isc-dhcp: Don't use canonical-package Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 09/38] gnu: isc-dhcp: Make an input unconditional Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 10/38] gnu: isc-dhcp: Remove unnecessary shebang patching Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 11/38] gnu: isc-dhcp: Remove trailing #t Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 12/38] gnu: gobject-introspection: Move things to native-inputs Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 13/38] gnu: gobject-introspection: Use python instead of python-wrapper Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 14/38] gnu: cairo: Make 'bash-minimal' input unconditional Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 15/38] gnu: libthai: Make 'datrie' " Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 16/38] gnu: libdatrie: Make input labels match the package name Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 17/38] gnu: pango: Make 'bash-minimal' input unconditional Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 18/38] gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 19/38] gnu: gdk-pixbuf: Respect #:tests? Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 20/38] gnu: gdk-pixbuf: Use target predicates Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 21/38] gnu: gdk-pixbuf: Make 'bash-minimal' input unconditional Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 22/38] gnu: gdk-pixbuf: Remove trailing #t Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 23/38] gnu: at-spi2-core: Make 'bash-minimal' input unconditional Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 24/38] gnu: at-spi2-core: Respect #:tests? Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 25/38] gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 26/38] gnu: at-spi2-core: Remove trailing #t Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 27/38] gnu: avahi: Make 'bash-minimal' input unconditional Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 28/38] gnu: avahi: Make the 'patch-more-shebangs' phase unconditional Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 29/38] gnu: freedesktop: Unconditionally use alternatives to % variables Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 30/38] gnu: wayland: Unconditionally lookup docbook in native-inputs Maxime Devos
2021-09-29 22:19 ` Maxime Devos [this message]
2021-09-29 22:19 ` [bug#50905] [PATCH 32/38] gnu: json-glib: Make 'bash-minimal' input unconditional Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 33/38] gnu: heimdal: Make some parts of phases unconditional Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 34/38] gnu: heimdal: Make 'bash-minimal' input unconditional Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 35/38] gnu: libcap: Unconditionally use #$output Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 36/38] gnu: libproxy: Respect #:tests? Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 37/38] build/qt-utils: Allow overriding the shell interpreter used Maxime Devos
2021-09-29 22:19 ` [bug#50905] [PATCH 38/38] lint: check-wrapper-inputs: Remove mentions of core-updates Maxime Devos
2021-10-01 9:52 ` [bug#50905] [PATCH core-updates 00/38] Clean up TODO(core-updates) Mathieu Othacehe
2021-10-01 14:23 ` Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 01/38] build-system/mozilla: New build system Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 02/38] gnu: nspr: Use mozilla-build-system Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 03/38] gnu: mozjs: " Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 04/38] gnu: icecat: " Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 05/38] build/minetest-build-system: Move png-file? to (guix build utils) Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 06/38] gnu: mozjs: Make the native-inputs unconditional Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 07/38] gnu: mozjs: Make the quasiquote unconditional Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 08/38] gnu: isc-dhcp: Don't use canonical-package Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 09/38] gnu: isc-dhcp: Make an input unconditional Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 10/38] gnu: isc-dhcp: Remove unnecessary shebang patching Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 11/38] gnu: isc-dhcp: Remove trailing #t Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 12/38] gnu: gobject-introspection: Move things to native-inputs Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 13/38] gnu: gobject-introspection: Use python instead of python-wrapper Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 14/38] gnu: cairo: Make 'bash-minimal' input unconditional Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 15/38] gnu: libthai: Make 'datrie' " Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 16/38] gnu: libdatrie: Make input labels match the package name Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 17/38] gnu: pango: Make 'bash-minimal' input unconditional Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 18/38] gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 19/38] gnu: gdk-pixbuf: Respect #:tests? Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 20/38] gnu: gdk-pixbuf: Use target predicates Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 21/38] gnu: gdk-pixbuf: Make 'bash-minimal' input unconditional Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 22/38] gnu: gdk-pixbuf: Remove trailing #t Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 23/38] gnu: at-spi2-core: Make 'bash-minimal' input unconditional Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 24/38] gnu: at-spi2-core: Respect #:tests? Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 25/38] gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 26/38] gnu: at-spi2-core: Remove trailing #t Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 27/38] gnu: avahi: Make 'bash-minimal' input unconditional Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 28/38] gnu: avahi: Make the 'patch-more-shebangs' phase unconditional Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 29/38] gnu: freedesktop: Unconditionally use alternatives to % variables Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 30/38] gnu: wayland: Unconditionally lookup docbook in native-inputs Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 31/38] gnu: json-glib: " Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 32/38] gnu: json-glib: Make 'bash-minimal' input unconditional Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 33/38] gnu: heimdal: Make some parts of phases unconditional Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 34/38] gnu: heimdal: Make 'bash-minimal' input unconditional Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 35/38] gnu: libcap: Unconditionally use #$output Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 36/38] gnu: libproxy: Respect #:tests? Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 37/38] build/qt-utils: Allow overriding the shell interpreter used Maxime Devos
2021-10-01 14:21 ` [bug#50905] [PATCH core-updates v2 38/38] lint: check-wrapper-inputs: Remove mentions of core-updates Maxime Devos
2021-10-02 16:54 ` bug#50905: [PATCH core-updates 00/38] Clean up TODO(core-updates) Mathieu Othacehe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210929221938.17168-31-maximedevos@telenet.be \
--to=maximedevos@telenet.be \
--cc=50905@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.