guix-patches
[Top][All Lists]
Advanced

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

[bug#50201] [PATCH 38/52] gnu: at-spi2-core: Find docbook when cross-com


From: Maxime Devos
Subject: [bug#50201] [PATCH 38/52] gnu: at-spi2-core: Find docbook when cross-compiling.
Date: Wed, 25 Aug 2021 20:03:18 +0200

* gnu/packages/gtk.scm
  (at-spi2-core)[arguments]<#:phases>{patch-docbook-sgml}: Look up
  "docbook-sxml" in 'native-inputs' instead of 'inputs' when cross-compiling.
---
 gnu/packages/gtk.scm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 73b805f6fe..49208716eb 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -744,10 +744,17 @@ 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 inputs #:allow-other-keys)
-             (let* ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
-                                           "/xml/dtd/docbook")))
+           (lambda* (#:key ,@(if (%current-target-system)
+                                 '(native-inputs)
+                                 '()) inputs #:allow-other-keys)
+             (let* ((xmldoc
+                     (string-append (assoc-ref ,(if (%current-target-system)
+                                                    '(or native-inputs inputs)
+                                                    'inputs)
+                                               "docbook-xml")
+                                    "/xml/dtd/docbook")))
                (substitute* "doc/libatspi/libatspi-docs.sgml"
                  (("http://.*/docbookx\\.dtd";)
                   (string-append xmldoc "/docbookx.dtd")))
-- 
2.33.0






reply via email to

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