diff options
| author | Eric Seidel <gridaphobe@gmail.com> | 2014-11-26 15:16:50 -0800 |
|---|---|---|
| committer | Eric Seidel <gridaphobe@gmail.com> | 2015-02-07 20:29:28 -0800 |
| commit | e08b9ab8d3d6362c774a786797347fa7483af773 (patch) | |
| tree | f64e5ce1224cb2cb8d5cfa0840bbb86daa68ecc3 /pkgs/tools/typesetting/docbook2x | |
| parent | 362d75975045c185e67cb0b66baa43d4d5e337c4 (diff) | |
| download | nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar.gz nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar.bz2 nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar.lz nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar.xz nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar.zst nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.zip | |
kill libiconvOr*
Conflicts: pkgs/applications/networking/mailreaders/sup/default.nix pkgs/development/compilers/ghc/7.8.3-binary.nix pkgs/development/interpreters/php/5.3.nix pkgs/development/interpreters/ruby/patches.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/poppler/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/tools/typesetting/docbook2x')
| -rw-r--r-- | pkgs/tools/typesetting/docbook2x/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index b31c64e6936..37cd6a2e50b 100644 --- a/pkgs/tools/typesetting/docbook2x/default.nix +++ b/pkgs/tools/typesetting/docbook2x/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, texinfo, perl , XMLSAX, XMLParser, XMLNamespaceSupport -, groff, libxml2, libxslt, gnused, libiconvOrEmpty, opensp +, groff, libxml2, libxslt, gnused, libiconv, opensp , docbook_xml_dtd_43 , makeWrapper }: @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { patches = [ ./db2x_texixml-to-stdout.patch ]; buildInputs = [ perl texinfo groff libxml2 libxslt makeWrapper - XMLSAX XMLParser XMLNamespaceSupport opensp - ] ++ libiconvOrEmpty; + XMLSAX XMLParser XMLNamespaceSupport opensp libiconv + ]; postConfigure = '' # Broken substitution is used for `perl/config.pl', which leaves literal |