guix-commits
[Top][All Lists]
Advanced

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

47/52: gnu: wayland: Find docbook-xml when cross-compiling.


From: guix-commits
Subject: 47/52: gnu: wayland: Find docbook-xml when cross-compiling.
Date: Mon, 20 Sep 2021 07:19:40 -0400 (EDT)

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

commit be58507d5d7f36da4c68bad2603c0a5b08858e1d
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Wed Aug 25 15:29:39 2021 +0200

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

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index ba0281b..550253b 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -983,14 +983,22 @@ Python.")
         #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-docbook-xml
-           (lambda* (#:key inputs #:allow-other-keys)
+           ;; TODO(core-updates): Use 'native-inputs' unconditionally
+           (lambda* (#:key ,@(if (%current-target-system)
+                                 '(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 inputs "docbook-xml")
+                  (string-append (assoc-ref ,(if (%current-target-system)
+                                                 '(or native-inputs inputs)
+                                                 'inputs) "docbook-xml")
                                  "/xml/dtd/docbook/"))
                  (("http://www.oasis-open.org/docbook/xml/4\\.2/";)
-                  (string-append (assoc-ref inputs "docbook-xml-4.2")
+                  (string-append (assoc-ref ,(if (%current-target-system)
+                                                 '(or native-inputs inputs)
+                                                 'inputs) "docbook-xml-4.2")
                                  "/xml/dtd/docbook/"))))
              #t))
          (add-after 'install 'move-doc



reply via email to

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