From 7e10a43b40bcc1b31cd2d9dd644759081622f2db Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Fri, 5 Mar 2021 16:16:06 +0100
Subject: [PATCH] heat: update new app version

The blocksize is now specified at runtime
---
 garlic/apps/heat/default.nix | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/garlic/apps/heat/default.nix b/garlic/apps/heat/default.nix
index a00c2b3..c950600 100644
--- a/garlic/apps/heat/default.nix
+++ b/garlic/apps/heat/default.nix
@@ -2,43 +2,29 @@
   stdenv
 , mpi
 , tampi
-, clangOmpss2
-, bsx ? 1024
-, bsy ? 1024
+, mcxx
+, gitBranch ? "master"
 }:
 
 stdenv.mkDerivation rec {
   name = "heat";
-  extension = if (bsx == bsy)
-    then "${toString bsx}bs.exe"
-    else "${toString bsx}x${toString bsy}bs.exe";
 
-  variant = "heat_ompss";
-  target = "${variant}.${extension}";
-
-  makeFlags = [
-    "BSX=${toString bsx}"
-    "BSY=${toString bsy}"
-    target
-  ];
-
-  src = ~/heat;
-  #src = builtins.fetchGit {
-  #  url = "ssh://git@bscpm03.bsc.es/garlic/apps/heat.git";
-  #  ref = "garlic";
-  #};
+  src = builtins.fetchGit {
+    url = "ssh://git@bscpm03.bsc.es/garlic/apps/heat.git";
+    ref = gitBranch;
+  };
 
   buildInputs = [
     mpi
-    clangOmpss2
+    mcxx
     tampi
   ];
 
-  programPath = "/bin/${target}";
+  programPath = "/bin/${name}";
 
   installPhase = ''
     mkdir -p $out/bin
-    cp ${target} $out/bin/
+    cp ${name} $out/bin/
 
     mkdir -p $out/etc
     cp heat.conf $out/etc/