summary refs log tree commit diff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2018-02-26 01:15:57 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2018-02-26 20:13:08 +0100
commit24a300b1bde7099b482bb4b8b7ecc27a5249a1e0 (patch)
treed67130ef43a840b0cfb586236720a21f2f2033fb
parent74b977d7259db7684dad52d4f01635df5ac80873 (diff)
downloadguix-24a300b1bde7099b482bb4b8b7ecc27a5249a1e0.tar.gz
gnu: dvdstyler: Remove hard-coded version string.
* gnu/packages/cdrom.scm (dvdstyler)[arguments]: Remove a hard-coded
version string from the docbook-xsl search path.
-rw-r--r--gnu/packages/cdrom.scm19
1 files changed, 10 insertions, 9 deletions
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index 598b584cb3..672064db12 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2017 John Darrington <jmd@gnu.org>
 ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
-;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2017 ng0 <ng0@n0.is>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -360,14 +360,15 @@ capacity is user-selectable.")
          "0lwc0hn94m9r8fi07sjqz3fr618l6lnw3zsakxw7nlgnxbjsk7pi"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags (list (string-append "XMLTO="
-                                              (assoc-ref %build-inputs "xmlto")
-                                              "/bin/xmlto"
-                                              " --searchpath "
-                                              (assoc-ref %build-inputs "docbook-xsl")
-                                              "/xml/xsl/docbook-xsl-1.79.1/htmlhelp:"
-                                              (assoc-ref %build-inputs "docbook-xml")
-                                              "/xml/dtd/docbook"))
+     `(#:configure-flags
+       (list (string-append "XMLTO="
+                            (assoc-ref %build-inputs "xmlto")
+                            "/bin/xmlto --searchpath "
+                            (assoc-ref %build-inputs "docbook-xsl")
+                            "/xml/xsl/docbook-xsl-" ,(package-version docbook-xsl)
+                            "/htmlhelp:"
+                            (assoc-ref %build-inputs "docbook-xml")
+                            "/xml/dtd/docbook"))
        #:phases
        (modify-phases %standard-phases
          (add-after 'install 'wrap-program