From 501a92376b5b7d63afb89dd6a2027877548f90ff Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Tue, 21 Nov 2023 16:55:47 +0100
Subject: [PATCH] Fix GPI-2 using an unified rdma-core

The libraries and includes are no longer in the default output, so we
merge them in a single directory using symlinkJoin.

Reviewed-by: Aleix Roca Nonell <aleix.rocanonell@bsc.es>
---
 pkgs/gpi-2/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/gpi-2/default.nix b/pkgs/gpi-2/default.nix
index 0e5d0d1..0386978 100644
--- a/pkgs/gpi-2/default.nix
+++ b/pkgs/gpi-2/default.nix
@@ -1,5 +1,6 @@
 {
   stdenv
+, symlinkJoin
 , slurm
 , rdma-core
 , autoconf
@@ -10,6 +11,13 @@
 , gfortran
 }:
 
+let
+  rdma-core-all = symlinkJoin {
+    name ="rdma-core-all";
+    paths = [ rdma-core.dev rdma-core.out ];
+  };
+in
+
 stdenv.mkDerivation rec {
   pname = "GPI-2";
   version = src.shortRev;
@@ -28,14 +36,14 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "--with-infiniband=${rdma-core}"
+    "--with-infiniband=${rdma-core-all}"
     "--with-mpi=${mpi}"
     "--with-slurm"
     "CFLAGS=-fPIC"
     "CXXFLAGS=-fPIC"
   ];
 
-  buildInputs = [ slurm mpi rdma-core autoconf automake libtool rsync gfortran ];
+  buildInputs = [ slurm mpi rdma-core-all autoconf automake libtool rsync gfortran ];
 
   hardeningDisable = [ "all" ];
 }