diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix
index f06fcec8412..f6d9d7ca69b 100644
--- a/pkgs/development/libraries/libcollectdclient/default.nix
+++ b/pkgs/development/libraries/libcollectdclient/default.nix
@@ -1,14 +1,9 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, collectd }:
+with stdenv.lib;
 
-stdenv.mkDerivation rec {
-  version = "5.5.0";
-  name = "libcollectdclient-${version}";
-  tarname = "collectd-${version}";
-
-  src = fetchurl {
-    url = "http://collectd.org/files/${tarname}.tar.bz2";
-    sha256 = "847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88";
-  };
+overrideDerivation collectd (oldAttrs: {
+  name = "libcollectdclient-${collectd.version}";
+  buildInputs = [ ];
 
   configureFlags = [
     "--without-daemon"
@@ -18,8 +13,7 @@ stdenv.mkDerivation rec {
     "-C src/libcollectdclient/"
   ];
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
-
+}) // {
   meta = with stdenv.lib; {
     description = "C Library for collectd, a daemon which collects system performance statistics periodically";
     homepage = http://collectd.org;
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index a1d676d708d..5f42e39871a 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -30,9 +30,9 @@
 , varnish ? null
 , yajl ? null
 }:
-
 stdenv.mkDerivation rec {
-  name = "collectd-5.5.0";
+  version = "5.5.0";
+  name = "collectd-${version}";
 
   src = fetchurl {
     url = "http://collectd.org/files/${name}.tar.bz2";