public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Docbook2x needs libiconv to build successfully on Darwin.

Browse Source 
svn path=/nixpkgs/trunk/; revision=17871
This commit is contained in:
Peter Simons 2009-10-19 09:17:21 +00:00
parent 1e575d3572
commit 61882544d8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/typesetting/docbook2x/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, texinfo, perl { fetchurl, stdenv, texinfo, perl
, XMLSAX, XMLParser, XMLNamespaceSupport , XMLSAX, XMLParser, XMLNamespaceSupport
, groff, libxml2, libxslt, gnused , groff, libxml2, libxslt, gnused, libiconv
, makeWrapper }: , makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
patches = [ ./db2x_texixml-to-stdout.patch ]; patches = [ ./db2x_texixml-to-stdout.patch ];
buildInputs = [ perl texinfo groff libxml2 libxslt makeWrapper buildInputs = [ perl texinfo groff libxml2 libxslt makeWrapper
XMLSAX XMLParser XMLNamespaceSupport ]; XMLSAX XMLParser XMLNamespaceSupport
] ++ (if libiconv != null then [libiconv] else []);
postConfigure = '' postConfigure = ''
# Broken substitution is used for `perl/config.pl', which leaves literal # Broken substitution is used for `perl/config.pl', which leaves literal

1
pkgs/top-level/all-packages.nix
View File

@ -663,6 +663,7 @@ let
inherit fetchurl stdenv texinfo perl inherit fetchurl stdenv texinfo perl
gnused groff libxml2 libxslt makeWrapper; gnused groff libxml2 libxslt makeWrapper;
inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport; inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport;
libiconv = if system == "i686-darwin" then libiconv else null;
}; };
dosfstools = composedArgsAndFun (import ../tools/misc/dosfstools) { dosfstools = composedArgsAndFun (import ../tools/misc/dosfstools) {