Merge branch 'master' into staging

* master: (271 commits)
  pysmbc: clarify license
  pysmbc: fix license
  bazel: 0.5.4 -> 0.6.0 (#29990)
  googler: init at 3.3
  go: declare support for aarch64
  firefox-beta-bin: 56.0b5 -> 57.0b4
  spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26
  gogs: 0.11.19 -> 0.11.29
  grafana: 4.5.1 -> 4.5.2
  mopidy-iris: 3.4.1 -> 3.4.9
  nextcloud: 12.0.2 -> 12.0.3
  haskell-json-autotype: jailbreak to fix build within LTS 9.x
  kore: fix up
  kore: init at 2.0.0
  glusterfs service: fix issues with useRpcbind
  tig: 2.2.2 -> 2.3.0
  haskell-hspec-core: enable test suite again
  hackage-packages.nix: automatic Haskell package set update
  librsvg: fix thumbnailer path
  awscli: 1.11.108 -> 1.11.162
  ...

1 files changed, 13 insertions, 7 deletions

diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index 4eb7400d7de..6f4b94f826d 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, darwin
 # optional:
 , pkgconfig ? null  # most of the extra deps need pkgconfig to be found
 , curl ? null
@@ -45,16 +45,22 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    curl iptables libatasmart libcredis libdbi libgcrypt libmemcached
-    cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt
-    lm_sensors libxml2 lvm2 libmysql postgresql protobufc rabbitmq-c rrdtool
-    varnish yajl jdk libtool python udev net_snmp hiredis libmnl libmicrohttpd
+    curl libdbi libgcrypt libmemcached
+    cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt
+    libxml2 libmysql postgresql protobufc rrdtool
+    varnish yajl jdk libtool python hiredis libmicrohttpd
+  ] ++ stdenv.lib.optionals stdenv.isLinux [
+    iptables libatasmart libcredis libmodbus libsigrok
+    lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.IOKit
+    darwin.apple_sdk.frameworks.ApplicationServices
   ];
 
   # for some reason libsigrok isn't auto-detected
   configureFlags =
     [ "--localstatedir=/var" ] ++
-    stdenv.lib.optional (libsigrok != null) "--with-libsigrok" ++
+    stdenv.lib.optional (stdenv.isLinux && libsigrok != null) "--with-libsigrok" ++
     stdenv.lib.optional (python != null) "--with-python=${python}/bin/python";
 
   # do not create directories in /var during installPhase
@@ -72,7 +78,7 @@ stdenv.mkDerivation rec {
     description = "Daemon which collects system performance statistics periodically";
     homepage = https://collectd.org;
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ bjornfor fpletz ];
   };
 }