Skip to content

Commit

Permalink
Merge pull request #26998 from volth/collectd-configure-flags
Browse files Browse the repository at this point in the history
collectd: fix configureFlags and jar location
  • Loading branch information
Mic92 committed Jul 1, 2017
2 parents 712d26d + 2f1c677 commit b1ae313
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions pkgs/tools/system/collectd/default.nix
Expand Up @@ -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;
Expand Down

0 comments on commit b1ae313

Please sign in to comment.