[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
30/38: gnu: wayland: Unconditionally lookup docbook in native-inputs.
|
From: |
guix-commits |
|
Subject: |
30/38: gnu: wayland: 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 65e5f1475dc8b2bf4d05ccc83630f8fc045367fa
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Fri Oct 1 16:21:32 2021 +0200
gnu: wayland: Unconditionally lookup docbook in native-inputs.
* gnu/packages/freedesktop.scm
(wayland)[arguments]<#:phases>{patch-docbook-sgml}:
Unconditionally look in (or native-inputs inputs) for docbook-xml and
docbook-xml-4.2.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
gnu/packages/freedesktop.scm | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 9bcf2d8..0f04a38 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -975,22 +975,16 @@ Python.")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-docbook-xml
- ;; TODO(core-updates): Use 'native-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\\.5/";)
- (string-append (assoc-ref ,(if (%current-target-system)
- '(or native-inputs inputs)
- 'inputs) "docbook-xml")
+ (string-append (assoc-ref (or native-inputs inputs)
+ "docbook-xml")
"/xml/dtd/docbook/"))
(("http://www.oasis-open.org/docbook/xml/4\\.2/";)
- (string-append (assoc-ref ,(if (%current-target-system)
- '(or native-inputs inputs)
- 'inputs) "docbook-xml-4.2")
+ (string-append (assoc-ref (or native-inputs inputs)
+ "docbook-xml-4.2")
"/xml/dtd/docbook/"))))
#t))
(add-after 'install 'move-doc
- 15/38: gnu: libthai: Make 'datrie' input unconditional., (continued)
- 15/38: gnu: libthai: Make 'datrie' input unconditional., guix-commits, 2021/10/02
- 17/38: gnu: pango: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 13/38: gnu: gobject-introspection: Use python instead of python-wrapper., guix-commits, 2021/10/02
- 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 <=
- 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