diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-03-01 18:04:12 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-03-01 18:04:12 +0100 |
| commit | 86990eeda2a85acd3640059c0b681f1eddbacba0 (patch) | |
| tree | df0d4f0b86dad2b260b7354d451993c141dde5e7 /gnu/packages/cdrom.scm | |
| parent | 6d796220c417a34100c282a7fa1f9afb6ac00339 (diff) | |
| parent | 52fb59ef253d9550ca4cfa095c2c0c2360d79095 (diff) | |
| download | guix-86990eeda2a85acd3640059c0b681f1eddbacba0.tar guix-86990eeda2a85acd3640059c0b681f1eddbacba0.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/cdrom.scm')
| -rw-r--r-- | gnu/packages/cdrom.scm | 19 |
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 |