From 2f1c67746c9239320e0bb55882c5d1ef2535392c Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Fri, 30 Jun 2017 20:10:08 +0000
Subject: collectd: fix configureFlags and place jars to $out/share/java

---
 pkgs/tools/system/collectd/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'pkgs/tools/system')

diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index 4aa5aee4c27..824eb74b72e 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -52,9 +52,21 @@ stdenv.mkDerivation rec {
 
   # for some reason libsigrok isn't auto-detected
   configureFlags =
+    [ "--localstatedir=/var" ] ++
     stdenv.lib.optional (libsigrok != null) "--with-libsigrok" ++
     stdenv.lib.optional (python != null) "--with-python=${python}/bin/python";
 
+  # do not create directories in /var during installPhase
+  postConfigure = ''
+     substituteInPlace Makefile --replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/' '#'
+  '';
+
+  postInstall = ''
+    if [ -d $out/share/collectd/java ]; then
+      mv $out/share/collectd/java $out/share/
+    fi
+  '';
+
   meta = with stdenv.lib; {
     description = "Daemon which collects system performance statistics periodically";
     homepage = https://collectd.org;
-- 
cgit 1.4.1