diff options
| author | Maxime Devos <maximedevos@telenet.be> | 2021-10-01 16:21:32 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-10-02 11:00:05 +0000 |
| commit | 65e5f1475dc8b2bf4d05ccc83630f8fc045367fa (patch) | |
| tree | 216f74dbbe4244fdd2d03ebfe90ca9085d167d45 | |
| parent | a4c40efa0558804b9d641c6624cfe06a668a6af6 (diff) | |
gnu: wayland: Unconditionally lookup docbook in native-inputs.
* gnu/packages/freedesktop.scm
(wayland)[arguments]<#:phases>{patch-docbook-sgml}:
Unconditionally look in (or native-inputs inputs) for docbook-xml and
docbook-xml-4.2.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
| -rw-r--r-- | gnu/packages/freedesktop.scm | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 9bcf2d8d3e..0f04a38c00 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -975,22 +975,16 @@ Python.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook-xml - ;; TODO(core-updates): Use 'native-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\\.5/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xml") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xml") "/xml/dtd/docbook/")) (("http://www.oasis-open.org/docbook/xml/4\\.2/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xml-4.2") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xml-4.2") "/xml/dtd/docbook/")))) #t)) (add-after 'install 'move-doc |