guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

18/38: gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs.


From: guix-commits
Subject: 18/38: gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs.
Date: Sat, 2 Oct 2021 12:52:41 -0400 (EDT)

mothacehe pushed a commit to branch core-updates
in repository guix.

commit cf7c7e25960d05e0151d018aad62c5c5d8a2faa5
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Fri Oct 1 16:21:20 2021 +0200

    gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs.
    
    * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>{patch-docbook}:
      Unconditionally look in (or native-inputs inputs) for docbook-xsl and
      docbook-xml.
    
    Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
 gnu/packages/gtk.scm | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 4f8b87e..fd7feab 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -623,23 +623,17 @@ highlighting and other features typical of a source code 
editor.")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-docbook
-           ;; TODO(core-updates): Unconditionally look in (or native-inputs 
inputs)
-           (lambda* (#:key ,@(if (%current-target-system)
-                                 '(native-inputs)
-                                 '())
-                     inputs #:allow-other-keys)
+           (lambda* (#:key native-inputs inputs #:allow-other-keys)
              (with-directory-excursion "docs"
                (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/")))
                (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) "docbook-xml")
+                  (string-append (assoc-ref (or native-inputs inputs)
+                                            "docbook-xml")
                                  "/xml/dtd/docbook/"))))
              #t))
          (add-before 'configure 'disable-failing-tests



reply via email to

[Prev in Thread] Current Thread [Next in Thread]