From 9c22baeeed9572183234dc66b399f70206430540 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 9 Aug 2019 11:35:18 +0200 Subject: rdma-core: 24.0 -> 25.0 --- pkgs/os-specific/linux/rdma-core/default.nix | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'pkgs/os-specific/linux/rdma-core') diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 6acd327ef0e..e604f73de2d 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, pandoc -, ethtool, iproute, libnl, udev, python, perl +{ stdenv, fetchFromGitHub, cmake, pkgconfig, docutils +, pandoc, ethtool, iproute, libnl, udev, python, perl +, makeWrapper } : let - version = "24.0"; + version = "25.0"; in stdenv.mkDerivation { name = "rdma-core-${version}"; @@ -12,10 +13,10 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "038msip4fnd8fh6m0vhnqwsaarp86dbnc9hvf5n19aqhlqbabbdc"; + sha256 = "1r1gfps1xckky06ib1rbf6lp58v2jqpy1ipkr45rf55gpaxf93cj"; }; - nativeBuildInputs = [ cmake pkgconfig pandoc ]; + nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ]; buildInputs = [ libnl ethtool iproute udev python perl ]; cmakeFlags = [ @@ -28,6 +29,22 @@ in stdenv.mkDerivation { --replace ethtool "${ethtool}/bin/ethtool" \ --replace 'ip addr' "${iproute}/bin/ip addr" \ --replace 'ip link' "${iproute}/bin/ip link" + + substituteInPlace srp_daemon/srp_daemon.sh.in \ + --replace /bin/rm rm + ''; + + postInstall = '' + # cmake script is buggy, move file manually + mkdir -p $out/${perl.libPrefix} + mv $out/share/perl5/* $out/${perl.libPrefix} + ''; + + postFixup = '' + for pls in $out/bin/{ibfindnodesusing.pl,ibidsverify.pl}; do + echo "wrapping $pls" + wrapProgram $pls --prefix PERL5LIB : "$out/${perl.libPrefix}" + done ''; meta = with stdenv.lib; { -- cgit 1.4.1