diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-10-21 22:49:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-21 22:49:46 +0100 |
| commit | aab3b1bb5a232941581980cbb744052569c22c08 (patch) | |
| tree | 3d66e6c2d5f5523391569a42ce329e2e150d68fd | |
| parent | dafd3c4f48cb1281dbf921d7874e66ec7eb5ecce (diff) | |
| parent | f7dbc720df4a820ef1126edb9702c29aa8036638 (diff) | |
| download | nixlib-aab3b1bb5a232941581980cbb744052569c22c08.tar nixlib-aab3b1bb5a232941581980cbb744052569c22c08.tar.gz nixlib-aab3b1bb5a232941581980cbb744052569c22c08.tar.bz2 nixlib-aab3b1bb5a232941581980cbb744052569c22c08.tar.lz nixlib-aab3b1bb5a232941581980cbb744052569c22c08.tar.xz nixlib-aab3b1bb5a232941581980cbb744052569c22c08.tar.zst nixlib-aab3b1bb5a232941581980cbb744052569c22c08.zip | |
Merge pull request #48797 from markuskowa/fix-corosync-rdma
corosync: update RDMA support to rdma-core
| -rw-r--r-- | pkgs/servers/corosync/default.nix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index 145052ff8c3a..d1dd7c05929d 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, nss, nspr, libqb -, dbus, librdmacm, libibverbs, libstatgrab, net_snmp +, dbus, rdma-core, libstatgrab, net_snmp , enableDbus ? false , enableInfiniBandRdma ? false , enableMonitoring ? false @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ nss nspr libqb ] ++ optional enableDbus dbus - ++ optional enableInfiniBandRdma [ librdmacm libibverbs ] + ++ optional enableInfiniBandRdma rdma-core ++ optional enableMonitoring libstatgrab ++ optional enableSnmp net_snmp; @@ -44,6 +44,17 @@ stdenv.mkDerivation rec { "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 = '' wrapProgram $out/bin/corosync-blackbox \ --prefix PATH ":" "$out/sbin:${libqb}/sbin" |