From be58507d5d7f36da4c68bad2603c0a5b08858e1d Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Wed, 25 Aug 2021 15:29:39 +0200 Subject: 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(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index ba0281b694..550253bc34 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 -- cgit v1.2.3