From 368aa57cb7d7845e472b3e4698d56e29293a3549 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Mon, 5 Oct 2020 10:28:38 +0200
Subject: [PATCH] nbody: Remove OpenMPI dirty hack

Was fixed in https://pm.bsc.es/gitlab/interoperability/tampi/-/commit/7e1a5128b6965242b0a4767ae95bc5ba0a1698f6
---
 garlic/nbody/default.nix | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/garlic/nbody/default.nix b/garlic/nbody/default.nix
index b45a852..fc94825 100644
--- a/garlic/nbody/default.nix
+++ b/garlic/nbody/default.nix
@@ -35,21 +35,10 @@ stdenv.mkDerivation rec {
     makeFlagsArray+=(CFLAGS="${cflags}")
   '' else "");
 
-  postPatch = ""
-
-  # This should be fixed in the Makefile as well.
-  + ''sed -i 's/libtampi.a/libtampi-c.a/g' Makefile
-  ''
-  # Dirty HACK until the nbody issue at:
-  # https://pm.bsc.es/gitlab/garlic/apps/nbody/-/issues/1
-  # is properly fixed.
-  +
-    (if (mpi.pname or "unknown") == "openmpi" then
-      ''sed -i 's/-lstdc++/-lstdc++ -lmpi_cxx/g' Makefile
-      ''
-    else
-      ""
-    );
+  # HACK: This should be fixed in the Makefile.
+  postPatch = ''
+    sed -i 's/libtampi.a/libtampi-c.a/g' Makefile
+  '';
 
   makeFlags = [
     "CC=${cc.cc.CC}"