diff options
| author | Markus Kowalewski <markus.kowalewski@gmail.com> | 2018-10-21 22:49:04 +0200 |
|---|---|---|
| committer | Markus Kowalewski <markus.kowalewski@gmail.com> | 2018-10-21 23:18:40 +0200 |
| commit | f7dbc720df4a820ef1126edb9702c29aa8036638 (patch) | |
| tree | 8e9179a3ddf7127fca1e109143a3a3da8c7bcad9 /pkgs/servers/corosync | |
| parent | ca127588c13d5e87c826d2f2e342db4af18daa24 (diff) | |
| download | nixpkgs-f7dbc720df4a820ef1126edb9702c29aa8036638.tar nixpkgs-f7dbc720df4a820ef1126edb9702c29aa8036638.tar.gz nixpkgs-f7dbc720df4a820ef1126edb9702c29aa8036638.tar.bz2 nixpkgs-f7dbc720df4a820ef1126edb9702c29aa8036638.tar.lz nixpkgs-f7dbc720df4a820ef1126edb9702c29aa8036638.tar.xz nixpkgs-f7dbc720df4a820ef1126edb9702c29aa8036638.tar.zst nixpkgs-f7dbc720df4a820ef1126edb9702c29aa8036638.zip | |
corosync: update RDMA support to rdma-core
The packages librdmacm and libibverbs are deprecated and are replaced by rdma-core. see https://github.com/NixOS/nixpkgs/issues/34314
Diffstat (limited to 'pkgs/servers/corosync')
| -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 145052ff8c3..d1dd7c05929 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" |