diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 09:25:10 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 09:25:10 +0200 |
| commit | aa9a04883e34f6a7b89846e87654577d5b218f46 (patch) | |
| tree | 5bc2d586532b76c0248a9e3280ec7e333ef6d893 /pkgs/tools/typesetting | |
| parent | 21f9180d49d1d911668620f3d8897c1e1352672a (diff) | |
| download | nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.gz nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.bz2 nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.lz nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.xz nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.zst nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.zip | |
Revert "Merge branch 'staging'" due to glibc
The main output started to retain dependency on bootstrap-tools; see https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096 This reverts commit c05d8295988697adbb920a7b4a999ae3670c5504, reversing changes made to f073df60d60444c30c49cb26d6b187a4100b41fe.
Diffstat (limited to 'pkgs/tools/typesetting')
| -rw-r--r-- | pkgs/tools/typesetting/xmlto/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index 37bc1831d5b1..f99c14720760 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, flex, libxml2, libxslt -, docbook_xml_dtd_45, docbook_xsl, w3m +, docbook_xml_dtd_42, docbook_xsl, w3m , bash, getopt, makeWrapper }: stdenv.mkDerivation rec { - name = "xmlto-0.0.28"; + name = "xmlto-0.0.26"; src = fetchurl { url = "http://fedorahosted.org/releases/x/m/xmlto/${name}.tar.bz2"; - sha256 = "0xhj8b2pwp4vhl9y16v3dpxpsakkflfamr191mprzsspg4xdyc0i"; + sha256 = "1v5mahfg5k9lh3anykl482xnrgxn36zlmqsgwahw29xwncprpd7g"; }; patchPhase = '' @@ -20,8 +20,7 @@ stdenv.mkDerivation rec { # `libxml2' provides `xmllint', needed at build-time and run-time. # `libxslt' provides `xsltproc', used by `xmlto' at run-time. - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ libxml2 libxslt docbook_xml_dtd_45 docbook_xsl getopt ]; + buildInputs = [ libxml2 libxslt docbook_xml_dtd_42 docbook_xsl getopt makeWrapper ]; postInstall = '' wrapProgram "$out/bin/xmlto" \ |