diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-17 18:26:28 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-17 18:26:28 +0200 |
| commit | ec736312d44e4cf63c1f86c7c38f2c2f28d1212e (patch) | |
| tree | 283a3734e8c4c39c8d5df06c1dfcdaa63680fe95 /pkgs/tools/typesetting | |
| parent | 6bd036d5f9e4f1c5caa305c98c379f986d3bc402 (diff) | |
| parent | 3f0ee819e2f15e8513d99c3569761fe8cd0bd8de (diff) | |
| download | nixlib-ec736312d44e4cf63c1f86c7c38f2c2f28d1212e.tar nixlib-ec736312d44e4cf63c1f86c7c38f2c2f28d1212e.tar.gz nixlib-ec736312d44e4cf63c1f86c7c38f2c2f28d1212e.tar.bz2 nixlib-ec736312d44e4cf63c1f86c7c38f2c2f28d1212e.tar.lz nixlib-ec736312d44e4cf63c1f86c7c38f2c2f28d1212e.tar.xz nixlib-ec736312d44e4cf63c1f86c7c38f2c2f28d1212e.tar.zst nixlib-ec736312d44e4cf63c1f86c7c38f2c2f28d1212e.zip | |
Merge branch 'master' into x-updates
Conflicts: pkgs/development/compilers/vala/default.nix (it's different version) pkgs/development/libraries/cairo/default.nix (trivial)
Diffstat (limited to 'pkgs/tools/typesetting')
| -rw-r--r-- | pkgs/tools/typesetting/docbook2x/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index 00dbe22aed35..d7d3f6f92a22 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, libiconv, opensp +, groff, libxml2, libxslt, gnused, libiconvOrEmpty, opensp , docbook_xml_dtd_43 , makeWrapper }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl texinfo groff libxml2 libxslt makeWrapper XMLSAX XMLParser XMLNamespaceSupport opensp - ] ++ (if libiconv != null then [libiconv] else []); + ] ++ libiconvOrEmpty; postConfigure = '' # Broken substitution is used for `perl/config.pl', which leaves literal |