diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index 0bb2338085c..d30ddc6e89b 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, flex, libxml2, libxslt -, docbook_xml_dtd_42, docbook_xsl +, docbook_xml_dtd_42, docbook_xsl, w3m , glibc, bash, getopt, mktemp, findutils , makeWrapper }: @@ -30,13 +30,22 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/xmlto --prefix PATH : "${libxslt}/bin:${libxml2}/bin" + + # `w3m' is needed for HTML to text conversions. + substituteInPlace "$out/share/xmlto/format/docbook/txt" \ + --replace "/usr/bin/w3m" "${w3m}/bin/w3m" ''; meta = { - description = ''xmlto is a front-end to an XSL toolchain. It chooses - an appropriate stylesheet for the conversion you want - and applies it using an external XSL-T processor. It - also performs any necessary post-processing.''; + description = "xmlto, a front-end to an XSL toolchain"; + + longDescription = '' + xmlto is a front-end to an XSL toolchain. It chooses an + appropriate stylesheet for the conversion you want and applies + it using an external XSL-T processor. It also performs any + necessary post-processing. + ''; + license = "GPLv2+"; homepage = http://cyberelk.net/tim/software/xmlto/; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88bd1f1e91a..7a068b4317b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1267,7 +1267,7 @@ let xmlto = import ../tools/typesetting/xmlto { inherit fetchurl stdenv flex libxml2 libxslt - docbook_xml_dtd_42 docbook_xsl + docbook_xml_dtd_42 docbook_xsl w3m glibc bash getopt mktemp findutils makeWrapper; };