guix-commits
[Top][All Lists]
Advanced

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

49/52: gnu: gdk-pixbuf: Find docbook when cross-compiling.


From: guix-commits
Subject: 49/52: gnu: gdk-pixbuf: Find docbook when cross-compiling.
Date: Mon, 20 Sep 2021 07:19:41 -0400 (EDT)

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

commit 26a336c20bd9f274c2117745828b514ceda18112
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Wed Aug 25 16:04:59 2021 +0200

    gnu: gdk-pixbuf: Find docbook when cross-compiling.
    
    * gnu/packages/gtk.scm
      (gdk-pixbuf)[arguments]<#:phases>{patch-docbook}: Look for docbook
      in 'native-inputs' instead of 'inputs' when cross-compiling.
---
 gnu/packages/gtk.scm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 6da70d4..017fd60 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -628,15 +628,23 @@ highlighting and other features typical of a source code 
editor.")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-docbook
-           (lambda* (#:key inputs #:allow-other-keys)
+           ;; TODO(core-updates): Unconditionally look in (or native-inputs 
inputs)
+           (lambda* (#:key ,@(if (%current-target-system)
+                                 '(native-inputs)
+                                 '())
+                     inputs #:allow-other-keys)
              (with-directory-excursion "docs"
                (substitute* "meson.build"
                  (("http://docbook.sourceforge.net/release/xsl/current/";)
-                  (string-append (assoc-ref inputs "docbook-xsl")
+                  (string-append (assoc-ref ,(if (%current-target-system)
+                                                 '(or native-inputs 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 inputs "docbook-xml")
+                  (string-append (assoc-ref ,(if (%current-target-system)
+                                                 '(or native-inputs 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]