From b9ae6181df7a203a80422563c11255c0c9521327 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Wed, 25 Aug 2021 14:01:38 +0200 Subject: gnu: at-spi2-core: Find docbook when cross-compiling. * 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 227e0b4f99..6e5a71c638 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"))) -- cgit 1.4.1