about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2014-08-31 16:53:29 +0200
committerDomen Kožar <domen@dev.si>2014-08-31 16:54:09 +0200
commitf70acd25847e1d18012acecb0923a024e7ff45d7 (patch)
tree44803d13b41d30ac2a6a3bc2c46c01b4d61aa571
parenta3d0fcda139d42f0cd72e00bef90d3d94f77ccb6 (diff)
downloadnixlib-f70acd25847e1d18012acecb0923a024e7ff45d7.tar
nixlib-f70acd25847e1d18012acecb0923a024e7ff45d7.tar.gz
nixlib-f70acd25847e1d18012acecb0923a024e7ff45d7.tar.bz2
nixlib-f70acd25847e1d18012acecb0923a024e7ff45d7.tar.lz
nixlib-f70acd25847e1d18012acecb0923a024e7ff45d7.tar.xz
nixlib-f70acd25847e1d18012acecb0923a024e7ff45d7.tar.zst
nixlib-f70acd25847e1d18012acecb0923a024e7ff45d7.zip
munin: fix test
-rw-r--r--pkgs/servers/monitoring/munin/default.nix2
-rw-r--r--pkgs/tools/misc/rrdtool/default.nix5
2 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 245c838607f3..0ce58e640158 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
             *.jar) continue;;
         esac
         wrapProgram "$file" \
-          --set PERL5LIB "$out/lib/perl5/site_perl:${with perlPackages; stdenv.lib.makePerlPath [
+          --set PERL5LIB "$out/lib/perl5/site_perl:${rrdtool}/lib/perl:${with perlPackages; stdenv.lib.makePerlPath [
                 Log4Perl IOSocketInet6 Socket6 URI DBFile DateManip
                 HTMLTemplate FileCopyRecursive FCGI NetSNMP NetServer
                 ListMoreUtils TimeHiRes DBDPg LWPUserAgent
diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix
index aa14087dfc85..29d98284ccf1 100644
--- a/pkgs/tools/misc/rrdtool/default.nix
+++ b/pkgs/tools/misc/rrdtool/default.nix
@@ -7,6 +7,11 @@ stdenv.mkDerivation {
     sha256 = "07fgn0y4yj7p2vh6a37q273hf98gkfw2sdam5r1ldn1k0m1ayrqj";
   };
   buildInputs = [ gettext perl pkgconfig libxml2 pango cairo ];
+  
+  postInstall = ''
+    # for munin support
+    mv $out/lib/perl/5*/*/*.pm $out/lib/perl/5*/
+  '';
 
   meta = {
     homepage = http://oss.oetiker.ch/rrdtool/;