diff options
| author | Maxime Devos <maximedevos@telenet.be> | 2021-08-25 10:50:38 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-09-20 11:15:07 +0000 |
| commit | d0cf033661610ee1e8e728dad8710b85a428f2e3 (patch) | |
| tree | 268a18288c72b415f574467b68aebf41ebcd25ee | |
| parent | bb4293469b070430893842c115ef2018aee8946c (diff) | |
| download | guix-d0cf033661610ee1e8e728dad8710b85a428f2e3.tar.gz guix-d0cf033661610ee1e8e728dad8710b85a428f2e3.zip | |
gnu: json-glib: Find docbook inputs when cross-compiling.
* gnu/packages/gnome.scm (json-glib)[arguments]<#:phases>{patch-docbook}:
Look up "docbook-xml" in 'native-inputs', not 'inputs', when
cross-compiling.
| -rw-r--r-- | gnu/packages/gnome.scm | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b66456dc6e..fbf3677bb6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4599,15 +4599,24 @@ configuration storage systems.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook - (lambda* (#:key inputs #:allow-other-keys) + ;; TODO(core-updates): Use (or native-inputs 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\\.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/"))) (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/")))) #t)) (add-after 'install 'move-docs |