corosync: 2.4.1 -> 2.4.2 + various improvements

This commit is contained in:
montag451 2016-11-28 08:15:56 +01:00
parent e797cfaeb6
commit f1cd1b4054

View file

@ -1,50 +1,61 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, nss, nspr, libqb { stdenv, fetchurl, makeWrapper, pkgconfig, nss, nspr, libqb
, dbus ? null , dbus, librdmacm, libibverbs, libstatgrab, net_snmp
, librdmacm ? null, libibverbs ? null , enableDbus ? false
, libstatgrab ? null , enableInfiniBandRdma ? false
, net_snmp ? null , enableMonitoring ? false
, enableSnmp ? false
}: }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "corosync-2.4.1"; name = "corosync-2.4.2";
src = fetchurl { src = fetchurl {
url = "http://build.clusterlabs.org/corosync/releases/${name}.tar.gz"; url = "http://build.clusterlabs.org/corosync/releases/${name}.tar.gz";
sha256 = "0w8m97ih7a2g99pmjsckw4xwbgzv96xdgg62s2a4qbgnw4yl637y"; sha256 = "1aab380mv4ivy5icmwvk7941jbs6ikm21p5ijk7brr4z608k0vpj";
}; };
buildInputs = [ nativeBuildInputs = [ makeWrapper pkgconfig ];
makeWrapper pkgconfig nss nspr libqb
dbus librdmacm libibverbs libstatgrab net_snmp
];
# Remove when rdma libraries gain pkgconfig support buildInputs = [
ibverbs_CFLAGS = optionalString (libibverbs != null) nss nspr libqb
"-I${libibverbs}/include/infiniband"; ] ++ optional enableDbus dbus
ibverbs_LIBS = optionalString (libibverbs != null) "-libverbs"; ++ optional enableInfiniBandRdma [ librdmacm libibverbs ]
rdmacm_CFLAGS = optionalString (librdmacm != null) ++ optional enableMonitoring libstatgrab
"-I${librdmacm}/include/rdma"; ++ optional enableSnmp net_snmp;
rdmacm_LIBS = optionalString (librdmacm != null) "-lrdmacm";
configureFlags = [ configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
"--with-logdir=/var/log/corosync"
"--enable-watchdog" "--enable-watchdog"
"--enable-qdevices" "--enable-qdevices"
] ++ optional (dbus != null) "--enable-dbus" ] ++ optional enableDbus "--enable-dbus"
++ optional (librdmacm != null && libibverbs != null) "--enable-rdma" ++ optional enableInfiniBandRdma "--enable-rdma"
++ optional (libstatgrab != null) "--enable-monitoring" ++ optional enableMonitoring "--enable-monitoring"
++ optional (net_snmp != null) "--enable-snmp"; ++ optional enableSnmp "--enable-snmp";
installFlags = [
"sysconfdir=$(out)/etc"
"localstatedir=$(out)/var"
"COROSYSCONFDIR=$(out)/etc/corosync"
"INITDDIR=$(out)/etc/init.d"
"LOGROTATEDIR=$(out)/etc/logrotate.d"
];
postInstall = '' postInstall = ''
wrapProgram $out/bin/corosync-blackbox \ wrapProgram $out/bin/corosync-blackbox \
--prefix PATH ":" "$out/sbin:${libqb}/sbin" --prefix PATH ":" "$out/sbin:${libqb}/sbin"
''; '';
enableParallelBuilding = true;
meta = { meta = {
homepage = http://corosync.org/; homepage = http://corosync.org/;
description = "A Group Communication System with features for implementing high availability within applications"; description = "A Group Communication System with features for implementing high availability within applications";
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ wkennington ]; maintainers = with maintainers; [ wkennington montag451 ];
}; };
} }