fix munin (and the test), refs #12801 #13999

(cherry picked from commit 7877e33af8c0ec7f3a91c650ae4da6288b7dfe49)
Signed-off-by: Domen Kožar <domen@dev.si>
This commit is contained in:
Domen Kožar 2016-03-28 10:25:46 +01:00
parent 8ffe681713
commit b4e2172ad4

View File

@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
doCheck = false; doCheck = false;
checkPhase = '' checkPhase = ''
export PERL5LIB="$PERL5LIB:${rrdtool}/lib/perl" export PERL5LIB="$PERL5LIB:${rrdtool}/lib/perl5/site_perl"
LC_ALL=C make -j1 test LC_ALL=C make -j1 test
''; '';
@ -109,10 +109,10 @@ stdenv.mkDerivation rec {
*.jar) continue;; *.jar) continue;;
esac esac
wrapProgram "$file" \ 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 Log4Perl IOSocketInet6 Socket6 URI DBFile DateManip
HTMLTemplate FileCopyRecursive FCGI NetCIDR NetSNMP NetServer HTMLTemplate FileCopyRecursive FCGI NetCIDR NetSNMP NetServer
ListMoreUtils TimeHiRes DBDPg LWPUserAgent ListMoreUtils TimeHiRes DBDPg LWPUserAgent rrdtool
]}" ]}"
done done
''; '';