* Enable GD support in Nagios.

svn path=/nixpkgs/trunk/; revision=9781
This commit is contained in:
Eelco Dolstra 2007-11-23 16:44:43 +00:00
parent 3fc397461a
commit 0f6f60c92d
2 changed files with 6 additions and 3 deletions

View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, perl }: { stdenv, fetchurl, perl, gdSupport ? false
, gd ? null, libpng ? null, zlib ? null
}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "nagios-2.10"; name = "nagios-2.10";
@ -9,7 +11,7 @@ stdenv.mkDerivation {
}; };
patches = [./nagios.patch]; patches = [./nagios.patch];
buildInputs = [perl]; buildInputs = [perl] ++ (if gdSupport then [gd libpng zlib] else []);
buildFlags = "all"; buildFlags = "all";
installTargets = "install install-config"; installTargets = "install install-config";

View File

@ -2761,7 +2761,8 @@ rec {
}; };
nagios = import ../servers/monitoring/nagios { nagios = import ../servers/monitoring/nagios {
inherit fetchurl stdenv perl; inherit fetchurl stdenv perl gd libpng zlib;
gdSupport = true;
}; };
nagiosPluginsOfficial = import ../servers/monitoring/nagios/plugins/official { nagiosPluginsOfficial = import ../servers/monitoring/nagios/plugins/official {