diff options
Diffstat (limited to 'pkgs/servers/monitoring/munin/default.nix')
-rw-r--r-- | pkgs/servers/monitoring/munin/default.nix | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 72d5f124c63d..032789ef05d0 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, which, coreutils, rrdtool, perl, perlPackages +{ stdenv, fetchFromGitHub, makeWrapper, which, coreutils, rrdtool, perlPackages , python, ruby, jre, nettools, bc }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { coreutils rrdtool nettools - perl + perlPackages.perl perlPackages.ModuleBuild perlPackages.HTMLTemplate perlPackages.NetCIDR @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { perlPackages.NetSNMP perlPackages.NetServer perlPackages.ListMoreUtils - perlPackages.TimeHiRes perlPackages.LWP perlPackages.DBDPg python @@ -60,8 +59,8 @@ stdenv.mkDerivation rec { doCheck = false; checkPhase = '' - export PERL5LIB="$PERL5LIB:${rrdtool}/lib/perl5/site_perl" - LC_ALL=C make -j1 test + export PERL5LIB="$PERL5LIB:${rrdtool}/${perlPackages.perl.libPrefix}" + LC_ALL=C make -j1 test ''; patches = [ @@ -95,8 +94,8 @@ stdenv.mkDerivation rec { makeFlags = '' PREFIX=$(out) DESTDIR=$(out) - PERLLIB=$(out)/lib/perl5/site_perl - PERL=${perl}/bin/perl + PERLLIB=$(out)/${perlPackages.perl.libPrefix} + PERL=${perlPackages.perl}/bin/perl PYTHON=${python}/bin/python RUBY=${ruby}/bin/ruby JAVARUN=${jre}/bin/java @@ -118,10 +117,10 @@ stdenv.mkDerivation rec { *.jar) continue;; esac wrapProgram "$file" \ - --set PERL5LIB "$out/lib/perl5/site_perl:${with perlPackages; stdenv.lib.makePerlPath [ + --set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${with perlPackages; makePerlPath [ LogLog4perl IOSocketInet6 Socket6 URI DBFile DateManip HTMLTemplate FileCopyRecursive FCGI NetCIDR NetSNMP NetServer - ListMoreUtils TimeHiRes DBDPg LWP rrdtool + ListMoreUtils DBDPg LWP rrdtool ]}" done ''; |