diff --git a/bsc/apps/hpccg/default.nix b/bsc/apps/hpccg/default.nix
new file mode 100644
index 0000000..7906f07
--- /dev/null
+++ b/bsc/apps/hpccg/default.nix
@@ -0,0 +1,42 @@
+{
+  stdenv
+, nanos6
+, mpi
+, mcxx
+, tampi
+, icc
+}:
+
+stdenv.mkDerivation rec {
+  name = "hpccg";
+
+  src = builtins.fetchGit {
+    url = "ssh://git@bscpm02.bsc.es/mmaronas/HPCCG.git";
+    ref = "mmaronas-development";
+  };
+
+  buildInputs = [
+    nanos6
+    mpi
+    icc
+    tampi
+    mcxx
+  ];
+
+  # The hpccg app fails to compile in parallel. Makefile must be fixed before.
+  enableParallelBuilding = false;
+
+  postPatch = ''
+    sed -i 's/mpic++/mpiicpc/g' Makefile
+    mkdir obj
+  '';
+
+  makeFlags =  [
+    "USE_MPI=-DUSING_MPI"
+    "TAMPI_HOME=${tampi}"
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+  '';
+}
diff --git a/default.nix b/default.nix
index e7e6f76..9675c4a 100644
--- a/default.nix
+++ b/default.nix
@@ -154,6 +154,9 @@ let
     hpcg = callPackage ./bsc/apps/hpcg/default.nix {
     };
 
+    hpccg = callPackage ./bsc/apps/hpccg/default.nix {
+    };
+
     # Patched nix for deep cluster
     inherit (callPackage ./bsc/nix/default.nix {
         storeDir = "/nix/store";