public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14002 from sheenobu/collectd_inherit 

libcollectdclient: make client derive from collectd package
This commit is contained in:
Franz Pletz 2016-03-18 10:44:00 +01:00
parent cf230c0b37 0bffa2f1a9
commit 57f4646fd1
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/libraries/libcollectdclient/default.nix
View File

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

4
pkgs/tools/system/collectd/default.nix
View File

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