Merge pull request #26998 from volth/collectd-configure-flags

collectd: fix configureFlags and jar location
This commit is contained in:
Jörg Thalheim 2017-07-01 19:01:13 +01:00 committed by GitHub
commit b1ae313111

@ -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;