From 0f6f60c92d88206e9bdacf5bc2fa26cf8d3d028c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 23 Nov 2007 16:44:43 +0000 Subject: [PATCH] * Enable GD support in Nagios. svn path=/nixpkgs/trunk/; revision=9781 --- pkgs/servers/monitoring/nagios/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 8a24e9dfaa4..dba063bb106 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchurl, perl, gdSupport ? false +, gd ? null, libpng ? null, zlib ? null +}: stdenv.mkDerivation { name = "nagios-2.10"; @@ -9,7 +11,7 @@ stdenv.mkDerivation { }; patches = [./nagios.patch]; - buildInputs = [perl]; + buildInputs = [perl] ++ (if gdSupport then [gd libpng zlib] else []); buildFlags = "all"; installTargets = "install install-config"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee6cf420d2b..ad326c6cbc1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2761,7 +2761,8 @@ rec { }; 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 {