nckx pushed a commit to branch master
in repository guix.

commit 24a300b1bde7099b482bb4b8b7ecc27a5249a1e0
Author: Tobias Geerinckx-Rice <[email protected]>
Date:   Mon Feb 26 01:15:57 2018 +0100

    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.
---
 gnu/packages/cdrom.scm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index 598b584..672064d 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2016 Marius Bakke <[email protected]>
 ;;; Copyright © 2017 John Darrington <[email protected]>
 ;;; Copyright © 2017 Thomas Danckaert <[email protected]>
-;;; Copyright © 2017 Tobias Geerinckx-Rice <[email protected]>
+;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <[email protected]>
 ;;; Copyright © 2017 ng0 <[email protected]>
 ;;;
 ;;; 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

Reply via email to