Merge pull request #243131 from algernon/rcc-2.1

riemann_c_client: Optional TLS support & other changes

Changed files
+22 -8
pkgs
tools
misc
riemann-c-client
+22 -8
pkgs/tools/misc/riemann-c-client/default.nix
···
-
{ lib, stdenv, fetchFromGitea, autoreconfHook, pkg-config, file , protobufc }:
+
{ lib, stdenv, fetchFromGitea, autoreconfHook, check, pkg-config, file, protobufc
+
,withWolfSSL ? false, wolfssl
+
,withGnuTLS ? false, gnutls
+
,withJSON ? true, json_c
+
}:
stdenv.mkDerivation rec {
pname = "riemann-c-client";
···
owner = "algernon";
repo = "riemann-c-client";
rev = "riemann-c-client-${version}";
-
sha256 = "sha256-FIhTT57g2uZBaH3EPNxNUNJn9n+0ZOhI6WMyF+xIr/Q=";
+
hash = "sha256-FIhTT57g2uZBaH3EPNxNUNJn9n+0ZOhI6WMyF+xIr/Q=";
};
-
nativeBuildInputs = [ autoreconfHook pkg-config ];
-
buildInputs = [ file protobufc ];
+
outputs = [ "bin" "dev" "out" ];
-
preBuild = ''
-
make lib/riemann/proto/riemann.pb-c.h
-
'';
+
nativeBuildInputs = [ autoreconfHook check pkg-config ];
+
buildInputs = [ file protobufc ]
+
++ lib.optional withWolfSSL wolfssl
+
++ lib.optional withGnuTLS gnutls
+
++ lib.optional withJSON json_c
+
;
+
+
configureFlags = []
+
++ lib.optional withWolfSSL "--with-tls=wolfssl"
+
++ lib.optional withGnuTLS "--with-tls=gnutls"
+
;
+
+
doCheck = true;
+
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://git.madhouse-project.org/algernon/riemann-c-client";
description = "A C client library for the Riemann monitoring system";
-
license = licenses.gpl3;
+
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ pradeepchhetri ];
platforms = platforms.linux;
};