From dcdaea355ad5b44dbb0b9929c21d83c247d77ac0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 28 Jan 2018 01:09:22 -0800 Subject: [PATCH] rdma-core: fix paths in rxe_cfg --- pkgs/os-specific/linux/rdma-core/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 22ce4a10f1c8..a7cf884a854b 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, ethtool, libnl, libudev, python, perl +, ethtool, nettools, libnl, libudev, python, perl } : let @@ -16,10 +16,13 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libnl ethtool libudev python perl ]; + buildInputs = [ libnl ethtool nettools libudev python perl ]; - postFixup = '' - substituteInPlace $out/bin/rxe_cfg --replace ethtool "${ethtool}/bin/ethtool" + postPatch = '' + substituteInPlace providers/rxe/rxe_cfg.in \ + --replace '@CMAKE_INSTALL_FULL_SHAREDSTATEDIR@' '/run' \ + --replace ethtool "${ethtool}/bin/ethtool" \ + --replace ifconfig "${nettools}/bin/ifconfig" ''; meta = with stdenv.lib; {