diff options
| author | Maxime Devos <maximedevos@telenet.be> | 2021-10-01 16:21:33 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-10-02 11:00:05 +0000 |
| commit | 97cd9b73a612bb6401202187f647caafc4b593c6 (patch) | |
| tree | 7d2d18562c6d967aefae355a402bf4409f7803cc | |
| parent | 65e5f1475dc8b2bf4d05ccc83630f8fc045367fa (diff) | |
gnu: json-glib: Unconditionally lookup docbook in native-inputs.
* gnu/packages/gnome.scm
(json-glib)[arguments]<#:phases>{patch-docbook}:
Unconditionally look in (or native-inputs inputs) for docbook-xml and
docbook-xsl.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
| -rw-r--r-- | gnu/packages/gnome.scm | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 497713cddc..57d9a9be79 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4607,24 +4607,17 @@ configuration storage systems.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook - ;; TODO(core-updates): Use (or native-inputs inputs) - ;; unconditionally. - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) inputs #:allow-other-keys) + (lambda* (#:key 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 ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) + (string-append (assoc-ref (or native-inputs inputs) "docbook-xml") "/xml/dtd/docbook/"))) (substitute* "meson.build" (("http://docbook.sourceforge.net/release/xsl/current/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xsl") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xsl") "/xml/xsl/docbook-xsl-1.79.2/")))) #t)) ;; When cross-compiling, there are no docs to move. |