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

collectd: update and reintroduce rabbitmq-c 0.4 to fix build for ZHF

Browse Source
This commit is contained in:
Luca Bruno 2015-04-17 15:07:30 +02:00
parent c90744fcb5
commit 19a1b86a15
3 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/libraries/rabbitmq-c/0.4.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchurl, cmake, openssl, popt, xmlto }:
stdenv.mkDerivation rec {
version = "0.4.1";
name = "rabbitmq-c-${version}";
src = fetchurl {
name = "${name}.tar.gz";
url = "https://github.com/alanxz/rabbitmq-c/releases/download/v${version}/${name}.tar.gz";
sha256 = "01m4n043hzhhxky8z67zj3r4gbg3mwcqbwqr9nms9lqbfaa70x93";
};
buildInputs = [ cmake openssl popt xmlto ];
meta = {
description = "RabbitMQ C AMQP client library";
homepage = https://github.com/alanxz/rabbitmq-c;
license = with stdenv.lib.licenses; mit;
platforms = with stdenv.lib.platforms; linux;
};
}

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

@ -26,11 +26,11 @@
}:
stdenv.mkDerivation rec {
name = "collectd-5.4.1";
name = "collectd-5.4.2";
src = fetchurl {
url = "http://collectd.org/files/${name}.tar.bz2";
sha256 = "1q365zx6d1wyhv7n97bagfxqnqbhj2j14zz552nhmjviy8lj2ibm";
sha256 = "14z3qkqbmfjvqvcb2v17480f7c8j7wa49myk0zlxpd9qq40fk2cp";
};
buildInputs = [

6
pkgs/top-level/all-packages.nix
View File

@ -986,7 +986,9 @@ let
convertlit = callPackage ../tools/text/convertlit { };
collectd = callPackage ../tools/system/collectd { };
collectd = callPackage ../tools/system/collectd {
rabbitmq-c = rabbitmq-c_0_4;
};
colormake = callPackage ../development/tools/build-managers/colormake { };
@ -7404,6 +7406,8 @@ let
rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {};
rabbitmq-c_0_4 = callPackage ../development/libraries/rabbitmq-c/0.4.nix {};
rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {};
raul = callPackage ../development/libraries/audio/raul { };