diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/typesetting/xmlto/default.nix | 26 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 12 insertions, 17 deletions
diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index 85d4ee010b38..423772385958 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -1,13 +1,12 @@ { fetchurl, stdenv, flex, libxml2, libxslt , docbook_xml_dtd_42, docbook_xsl, w3m -, bash, getopt, mktemp, findutils -, makeWrapper }: +, bash, getopt, makeWrapper }: stdenv.mkDerivation rec { - name = "xmlto-0.0.20"; + name = "xmlto-0.0.23"; src = fetchurl { - url = "http://cyberelk.net/tim/data/xmlto/stable/${name}.tar.bz2"; - sha256 = "1s71khb0ycawhjpr19zrrqk0jac11jgwvxnajjkm2656p5qikylz"; + url = "http://fedorahosted.org/releases/x/m/xmlto/${name}.tar.bz2"; + sha256 = "1i5iihx304vj52nik42drs7z6z58m9szahng113r4mgd1mvb5zx9"; }; patchPhase = '' @@ -15,21 +14,17 @@ stdenv.mkDerivation rec { --replace "/bin/bash" "${bash}/bin/bash" substituteInPlace "xmlto.in" \ --replace "/usr/bin/locale" "$(type -P locale)" - ''; - - configureFlags = '' - --with-mktemp=${mktemp}/bin/mktemp - --with-find=${findutils}/bin/find - --with-bash=${bash}/bin/bash - --with-getopt=${getopt}/bin/getopt + substituteInPlace "xmlto.in" \ + --replace "mktemp" "$(type -P mktemp)" ''; # `libxml2' provides `xmllint', needed at build-time and run-time. # `libxslt' provides `xsltproc', used by `xmlto' at run-time. - buildInputs = [ libxml2 libxslt docbook_xml_dtd_42 docbook_xsl makeWrapper ]; + buildInputs = [ libxml2 libxslt docbook_xml_dtd_42 docbook_xsl getopt makeWrapper ]; postInstall = '' - wrapProgram $out/bin/xmlto --prefix PATH : "${libxslt}/bin:${libxml2}/bin" + wrapProgram "$out/bin/xmlto" \ + --prefix PATH : "${libxslt}/bin:${libxml2}/bin:${getopt}/bin" # `w3m' is needed for HTML to text conversions. substituteInPlace "$out/share/xmlto/format/docbook/txt" \ @@ -47,8 +42,9 @@ stdenv.mkDerivation rec { ''; license = "GPLv2+"; - homepage = http://cyberelk.net/tim/software/xmlto/; + homepage = https://fedorahosted.org/xmlto/; maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 505ed109428b..56b5d0baa9c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1884,8 +1884,7 @@ let xmlto = import ../tools/typesetting/xmlto { inherit fetchurl stdenv flex libxml2 libxslt - docbook_xml_dtd_42 docbook_xsl w3m - bash getopt mktemp findutils makeWrapper; + docbook_xml_dtd_42 docbook_xsl w3m bash getopt makeWrapper; }; xmltv = import ../tools/misc/xmltv { |