diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-12-20 17:40:43 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-01-02 17:01:07 +0100 |
| commit | 0f72f0523878361df9c57078c68958689a41b513 (patch) | |
| tree | 7c9b80d8ddf5b846e793c4e634df064752b8649f /gnu/packages/docbook.scm | |
| parent | 0c86790bfdf5a3e61bff6e289c1dcef16154a27b (diff) | |
| download | guix-0f72f0523878361df9c57078c68958689a41b513.tar.gz | |
gnu: docbook-xsl: Disable recursion in string substitution.
Fixes <https://bugs.gnu.org/29782>. Reported by Gábor Boskovits. * gnu/packages/patches/docbook-xsl-nonrecursive-string-subst.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/docbook.scm (docbook-xsl)[source](patches): Use it. [native-inputs]: Add XZ. [arguments]: Adjust PATH accordingly.
Diffstat (limited to 'gnu/packages/docbook.scm')
| -rw-r--r-- | gnu/packages/docbook.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 189ece01ab..ed1e60a7a3 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -136,6 +136,8 @@ by no means limited to these applications.) This package provides XML DTDs.") (method url-fetch) (uri (string-append "mirror://sourceforge/docbook/docbook-xsl/" version "/docbook-xsl-" version ".tar.bz2")) + ;; Note: If removing all patches, the XZ dependency is no longer needed. + (patches (search-patches "docbook-xsl-nonrecursive-string-subst.patch")) (sha256 (base32 "0s59lihif2fr7rznckxr2kfyrvkirv76r1zvidp9b5mj28p4apvj")))) @@ -145,11 +147,12 @@ by no means limited to these applications.) This package provides XML DTDs.") (use-modules (guix build utils)) (let* ((bzip2 (assoc-ref %build-inputs "bzip2")) + (xz (assoc-ref %build-inputs "xz")) (tar (assoc-ref %build-inputs "tar")) (source (assoc-ref %build-inputs "source")) (out (assoc-ref %outputs "out")) (xsl (string-append out "/xml/xsl"))) - (setenv "PATH" (string-append bzip2 "/bin")) + (setenv "PATH" (string-append bzip2 "/bin" ":" xz "/bin")) (system* (string-append tar "/bin/tar") "xvf" source) (mkdir-p xsl) @@ -162,6 +165,7 @@ by no means limited to these applications.) This package provides XML DTDs.") name-version "/"))))) #:modules ((guix build utils)))) (native-inputs `(("bzip2" ,bzip2) + ("xz" ,xz) ("tar" ,tar))) (home-page "http://docbook.org") (synopsis "DocBook XSL style sheets for document authoring") |