collectd: fix configureFlags and place jars to $out/share/java
This commit is contained in:
parent
e020640932
commit
2f1c67746c
@ -52,9 +52,21 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
# for some reason libsigrok isn't auto-detected
|
# for some reason libsigrok isn't auto-detected
|
||||||
configureFlags =
|
configureFlags =
|
||||||
|
[ "--localstatedir=/var" ] ++
|
||||||
stdenv.lib.optional (libsigrok != null) "--with-libsigrok" ++
|
stdenv.lib.optional (libsigrok != null) "--with-libsigrok" ++
|
||||||
stdenv.lib.optional (python != null) "--with-python=${python}/bin/python";
|
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; {
|
meta = with stdenv.lib; {
|
||||||
description = "Daemon which collects system performance statistics periodically";
|
description = "Daemon which collects system performance statistics periodically";
|
||||||
homepage = https://collectd.org;
|
homepage = https://collectd.org;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user