summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2016-03-18 10:44:00 +0100
committerFranz Pletz <fpletz@fnordicwalking.de>2016-03-18 10:44:00 +0100
commit57f4646fd13397483b2429b2501712ffc8ab5e98 (patch)
treea724cef735480a421cd906ca75ba7488a35f1ed9 /pkgs/development
parentcf230c0b37cb5dcd5543dc82cdaddaaccb86a40d (diff)
parent0bffa2f1a9c7681c14c5855e8ab6a03a7f462fbf (diff)
downloadnixlib-57f4646fd13397483b2429b2501712ffc8ab5e98.tar
nixlib-57f4646fd13397483b2429b2501712ffc8ab5e98.tar.gz
nixlib-57f4646fd13397483b2429b2501712ffc8ab5e98.tar.bz2
nixlib-57f4646fd13397483b2429b2501712ffc8ab5e98.tar.lz
nixlib-57f4646fd13397483b2429b2501712ffc8ab5e98.tar.xz
nixlib-57f4646fd13397483b2429b2501712ffc8ab5e98.tar.zst
nixlib-57f4646fd13397483b2429b2501712ffc8ab5e98.zip
Merge pull request #14002 from sheenobu/collectd_inherit
libcollectdclient: make client derive from collectd package
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/libcollectdclient/default.nix18
1 files changed, 6 insertions, 12 deletions
diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix
index f06fcec84126..f6d9d7ca69b8 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;