WIP

garlic/apps/hpcg/default.nix

@@ -2,40 +2,37 @@
   stdenv
 , nanos6
 , mpi
-, mcxx
 , tampi
-, icc
+, cc
+, gitBranch ? "garlic/seq"
+, makefileName ? "Linux_Serial"
 }:
 
 stdenv.mkDerivation rec {
   name = "hpcg";
 
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm02.bsc.es/rpenacob/hpcg.git";
-    ref = "symgs_coloring_more_than_one_block_per_task_halos_blocking_discreete";
+    url = "ssh://git@bscpm02.bsc.es/rpenacob/garlic-hpcg.git";
+    ref = "${gitBranch}";
   };
 
   prePatch = ''
     #export NIX_DEBUG=6
   '';
 
-  patches = [ ./tampi.patch ];
-
   buildInputs = [
     nanos6
     mpi
-    icc
     tampi
-    mcxx
+    cc
   ];
 
   enableParallelBuilding = true;
 
   configurePhase = ''
-    export TAMPI_HOME=${tampi}
     mkdir build
     cd build
-    ../configure MPI_ICPC_OSS
+    ../configure ${makefileName}
   '';
 
   installPhase = ''