[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
25/38: gnu: at-spi2-core: Unconditionally lookup docbook in native-input
From: |
guix-commits |
Subject: |
25/38: gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs. |
Date: |
Sat, 2 Oct 2021 12:52:44 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit c3417f07546e9d5c7b1c3acb19d67b3b377d59fb
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Fri Oct 1 16:21:27 2021 +0200
gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs.
* gnu/packages/gtk.scm
(at-spi2-core)[arguments]<#:phases>{patch-docbook-sgml}:
Unconditionally look in (or native-inputs inputs) for docbook-xml.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
gnu/packages/gtk.scm | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index d829218..634a012 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -740,15 +740,10 @@ scaled, composited, modified, saved, or rendered.")
(lambda* (#:key outputs #:allow-other-keys)
(mkdir-p (string-append (assoc-ref outputs "doc") "/share"))
#t))
- ;; TODO(core-updates): Unconditionally use (or native-inputs inputs)
(add-after 'unpack 'patch-docbook-sgml
- (lambda* (#:key ,@(if (%current-target-system)
- '(native-inputs)
- '()) inputs #:allow-other-keys)
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
(let* ((xmldoc
- (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* "doc/libatspi/libatspi-docs.sgml"
- 21/38: gnu: gdk-pixbuf: Make 'bash-minimal' input unconditional., (continued)
- 21/38: gnu: gdk-pixbuf: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 20/38: gnu: gdk-pixbuf: Use target predicates., guix-commits, 2021/10/02
- 23/38: gnu: at-spi2-core: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 26/38: gnu: at-spi2-core: Remove trailing #t., guix-commits, 2021/10/02
- 27/38: gnu: avahi: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 28/38: gnu: avahi: Make the 'patch-more-shebangs' phase unconditional., guix-commits, 2021/10/02
- 29/38: gnu: freedesktop: Unconditionally use alternatives to % variables., guix-commits, 2021/10/02
- 30/38: gnu: wayland: Unconditionally lookup docbook in native-inputs., guix-commits, 2021/10/02
- 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 <=
- 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, 2021/10/02
- 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