From bff039587259cfa7bd1717a03e1def5c8e8f15b5 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Thu, 2 Mar 2023 13:08:01 +0100
Subject: [PATCH] Update mpich to follow upstream

---
 overlay.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/overlay.nix b/overlay.nix
index 7e4e345..de1b4c1 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -126,8 +126,16 @@ let
     psmpi = callPackage ./bsc/parastation/psmpi.nix { };
 
     # MPICH
-    mpich = callPackage ./bsc/mpich/default.nix { };
-    mpichDebug = bsc.mpich.override { enableDebug = true; };
+    #mpich_3 = callPackage ./bsc/mpich/default.nix { };
+    #mpichDebug_3 = bsc.mpich.override { enableDebug = true; };
+    mpich = super.mpich.overrideAttrs (old: {
+      buildInputs = old.buildInputs ++ [ self.libfabric ];
+      configureFlags = old.configureFlags ++ [
+        "--with-device=ch4:ofi"
+        "--with-libfabric=${self.libfabric}"
+      ];
+      hardeningDisable = [ "all" ];
+    });
 
     # Default Intel MPI version is 2019 (the last one)
     impi = bsc.intelMpi;