diff options
| author | Domen Kožar <domen@dev.si> | 2016-03-28 10:25:46 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-03-28 10:26:35 +0100 |
| commit | b4e2172ad426fdaddfe636f2881ac94cde970398 (patch) | |
| tree | 118ad487541728ef4bbf11acc8ef871f44912126 /pkgs/servers/monitoring | |
| parent | 8ffe6817134e6ccbad2cd1a69a420182649938cd (diff) | |
| download | nixlib-b4e2172ad426fdaddfe636f2881ac94cde970398.tar nixlib-b4e2172ad426fdaddfe636f2881ac94cde970398.tar.gz nixlib-b4e2172ad426fdaddfe636f2881ac94cde970398.tar.bz2 nixlib-b4e2172ad426fdaddfe636f2881ac94cde970398.tar.lz nixlib-b4e2172ad426fdaddfe636f2881ac94cde970398.tar.xz nixlib-b4e2172ad426fdaddfe636f2881ac94cde970398.tar.zst nixlib-b4e2172ad426fdaddfe636f2881ac94cde970398.zip | |
fix munin (and the test), refs #12801 #13999
(cherry picked from commit 7877e33af8c0ec7f3a91c650ae4da6288b7dfe49) Signed-off-by: Domen Kožar <domen@dev.si>
Diffstat (limited to 'pkgs/servers/monitoring')
| -rw-r--r-- | pkgs/servers/monitoring/munin/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 51eda757e3c2..71f76695bb2e 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { doCheck = false; checkPhase = '' - export PERL5LIB="$PERL5LIB:${rrdtool}/lib/perl" + export PERL5LIB="$PERL5LIB:${rrdtool}/lib/perl5/site_perl" LC_ALL=C make -j1 test ''; @@ -109,10 +109,10 @@ stdenv.mkDerivation rec { *.jar) continue;; esac wrapProgram "$file" \ - --set PERL5LIB "$out/lib/perl5/site_perl:${rrdtool}/lib/perl:${with perlPackages; stdenv.lib.makePerlPath [ + --set PERL5LIB "$out/lib/perl5/site_perl:${with perlPackages; stdenv.lib.makePerlPath [ Log4Perl IOSocketInet6 Socket6 URI DBFile DateManip HTMLTemplate FileCopyRecursive FCGI NetCIDR NetSNMP NetServer - ListMoreUtils TimeHiRes DBDPg LWPUserAgent + ListMoreUtils TimeHiRes DBDPg LWPUserAgent rrdtool ]}" done ''; |