guix-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: bug#24145: [PATCH] gnu: asciidoc: Use local docbook-xsl package.


From: Tomáš Čech
Subject: Re: bug#24145: [PATCH] gnu: asciidoc: Use local docbook-xsl package.
Date: Tue, 30 Aug 2016 18:51:15 +0200
User-agent: Mutt/1.6.2-neo (2016-06-11)

On Mon, Aug 29, 2016 at 05:41:59PM +0200, Ludovic Courtès wrote:
Hello,

Tomáš Čech <address@hidden> skribis:

* gnu/packages/documentation.scm(asciidoc): New input docbook-xsl,
  replace use of online source and prefer docbook-xsl package.

Rather:

* gnu/packages/documentation (asciidoc)[inputs]: Add PYTHON-2 and
DOCBOOK-XSL.
(arguments): Add 'make-local-docbook-xsl' phase.

Shouldn't that be rather
[arguments]:
as it is in "the same level" as [inputs]?
(and python-2 was already among inputs already)

Thanks for your patience!

diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index 72af708..98d30e7 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -49,8 +49,22 @@
                (base32
                 "1w71nk527lq504njmaf0vzr93pgahkgzzxzglrq6bay8cw2rvnvq"))))
     (build-system gnu-build-system)
-    (arguments '(#:tests? #f))                    ; no 'check' target
-    (inputs `(("python" ,python-2)))
+    (arguments
+     `(#:tests? #f                     ; no 'check' target
+       #:phases
+       (modify-phases %standard-phases
+         (add-before
+             'install 'make-local-docbook-xsl
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* (find-files "docbook-xsl" ".*\\.xsl$")
+               (("xsl:import 
href=\"http://docbook.sourceforge.net/release/xsl/current";)
+                (string-append
+                 "xsl:import href=\""
+                 (string-append (assoc-ref inputs "docbook-xsl")
+                                "/xml/xsl/docbook-xsl-"
+                                ,(package-version docbook-xsl))))))))))
+    (inputs `(("python" ,python-2)
+              ("docbook-xsl" ,docbook-xsl)))

Otherwise LGTM, please push!

I'm afraid that Leo already pushed that.

Thanks

Attachment: signature.asc
Description: Digital signature


reply via email to

[Prev in Thread] Current Thread [Next in Thread]