Docbook2x needs libiconv to build successfully on Darwin.
svn path=/nixpkgs/trunk/; revision=17871
This commit is contained in:
parent
1e575d3572
commit
61882544d8
@ -1,6 +1,6 @@
|
||||
{ fetchurl, stdenv, texinfo, perl
|
||||
, XMLSAX, XMLParser, XMLNamespaceSupport
|
||||
, groff, libxml2, libxslt, gnused
|
||||
, groff, libxml2, libxslt, gnused, libiconv
|
||||
, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
|
||||
patches = [ ./db2x_texixml-to-stdout.patch ];
|
||||
|
||||
buildInputs = [ perl texinfo groff libxml2 libxslt makeWrapper
|
||||
XMLSAX XMLParser XMLNamespaceSupport ];
|
||||
XMLSAX XMLParser XMLNamespaceSupport
|
||||
] ++ (if libiconv != null then [libiconv] else []);
|
||||
|
||||
postConfigure = ''
|
||||
# Broken substitution is used for `perl/config.pl', which leaves literal
|
||||
|
@ -663,6 +663,7 @@ let
|
||||
inherit fetchurl stdenv texinfo perl
|
||||
gnused groff libxml2 libxslt makeWrapper;
|
||||
inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport;
|
||||
libiconv = if system == "i686-darwin" then libiconv else null;
|
||||
};
|
||||
|
||||
dosfstools = composedArgsAndFun (import ../tools/misc/dosfstools) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user