GNU bug report logs - #50905
[PATCH core-updates 00/38] Clean up TODO(core-updates)

Previous Next

Full log

Message #197 received at 50905 <at> debbugs.gnu.org (full text, mbox):

From: Maxime Devos <maximedevos <at> telenet.be>
To: Mathieu Othacehe <othacehe <at> gnu.org>
Cc: Maxime Devos <maximedevos <at> telenet.be>, 50905 <at> debbugs.gnu.org
Subject: [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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.