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

Merge pull request #48797 from markuskowa/fix-corosync-rdma

Browse Source 
corosync: update RDMA support to rdma-core
This commit is contained in:
Jörg Thalheim 2018-10-21 22:49:46 +01:00 committed by GitHub
commit aab3b1bb5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/servers/corosync/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, nss, nspr, libqb { stdenv, fetchurl, makeWrapper, pkgconfig, nss, nspr, libqb
, dbus, librdmacm, libibverbs, libstatgrab, net_snmp , dbus, rdma-core, libstatgrab, net_snmp
, enableDbus ? false , enableDbus ? false
, enableInfiniBandRdma ? false , enableInfiniBandRdma ? false
, enableMonitoring ? false , enableMonitoring ? false
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
nss nspr libqb nss nspr libqb
] ++ optional enableDbus dbus ] ++ optional enableDbus dbus
++ optional enableInfiniBandRdma [ librdmacm libibverbs ] ++ optional enableInfiniBandRdma rdma-core
++ optional enableMonitoring libstatgrab ++ optional enableMonitoring libstatgrab
++ optional enableSnmp net_snmp; ++ optional enableSnmp net_snmp;
@ -44,6 +44,17 @@ stdenv.mkDerivation rec {
"LOGROTATEDIR=$(out)/etc/logrotate.d" "LOGROTATEDIR=$(out)/etc/logrotate.d"
]; ];
preConfigure = optionalString enableInfiniBandRdma ''
# configure looks for the pkg-config files
# of librdmacm and libibverbs
# Howver, rmda-core does not provide a pkg-config file
# We give the flags manually here:
export rdmacm_LIBS=-lrdmacm
export rdmacm_CFLAGS=" "
export ibverbs_LIBS=-libverbs
export ibverbs_CFLAGS=" "
'';
postInstall = '' postInstall = ''
wrapProgram $out/bin/corosync-blackbox \ wrapProgram $out/bin/corosync-blackbox \
--prefix PATH ":" "$out/sbin:${libqb}/sbin" --prefix PATH ":" "$out/sbin:${libqb}/sbin"