diff options
author | markuskowa <markus.kowalewski@gmail.com> | 2022-03-30 23:11:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-30 23:11:48 +0200 |
commit | fac028f92d64dfb93c0de0ee8a21a940befeedac (patch) | |
tree | 7fd227207770886ad70d350377c6630530f28eb9 /pkgs | |
parent | 2f5b1f3db06b13b8cb54710e2532cf6821d75417 (diff) | |
parent | 20392d90caadfa8fd4ff7bcabd488934604b11f2 (diff) | |
download | nixlib-fac028f92d64dfb93c0de0ee8a21a940befeedac.tar nixlib-fac028f92d64dfb93c0de0ee8a21a940befeedac.tar.gz nixlib-fac028f92d64dfb93c0de0ee8a21a940befeedac.tar.bz2 nixlib-fac028f92d64dfb93c0de0ee8a21a940befeedac.tar.lz nixlib-fac028f92d64dfb93c0de0ee8a21a940befeedac.tar.xz nixlib-fac028f92d64dfb93c0de0ee8a21a940befeedac.tar.zst nixlib-fac028f92d64dfb93c0de0ee8a21a940befeedac.zip |
Merge pull request #166412 from tfc/rdma-core-pkgconfig-fix
rdma-core: Fix pkg-config files
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/rdma-core/default.nix | 6 | ||||
-rw-r--r-- | pkgs/os-specific/linux/rdma-core/pkg-config-template.patch | 14 |
2 files changed, 20 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index f7543291deda..60d917e8e622 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -23,6 +23,12 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib" ]; + patches = [ + # this has been fixed in master. As soon as it gets into a release, this + # patch won't apply anymore and can be removed. + ./pkg-config-template.patch + ]; + postPatch = '' substituteInPlace srp_daemon/srp_daemon.sh.in \ --replace /bin/rm rm diff --git a/pkgs/os-specific/linux/rdma-core/pkg-config-template.patch b/pkgs/os-specific/linux/rdma-core/pkg-config-template.patch new file mode 100644 index 000000000000..22898bc75282 --- /dev/null +++ b/pkgs/os-specific/linux/rdma-core/pkg-config-template.patch @@ -0,0 +1,14 @@ +diff -ru source/buildlib/template.pc.in source-fixed/buildlib/template.pc.in +--- source/buildlib/template.pc.in 1970-01-01 01:00:01.000000000 +0100 ++++ source-fixed/buildlib/template.pc.in 2022-03-30 22:29:12.988625941 +0200 +@@ -1,7 +1,6 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=${prefix} +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++exec_prefix=@CMAKE_INSTALL_PREFIX@ ++libdir=@CMAKE_INSTALL_LIBDIR@ ++includedir=@CMAKE_INSTALL_INCLUDEDIR@ + + Name: lib@PC_LIB_NAME@ + Description: RDMA Core Userspace Library |