diff --git a/bsc/cpic/default.nix b/bsc/cpic/default.nix
index 133a81d..a88afde 100644
--- a/bsc/cpic/default.nix
+++ b/bsc/cpic/default.nix
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     export NANOS6_HOME="${nanos6}"
+    export TAMPI_HOME="${tampi}"
   '';
 
   #enableParallelBuilding = true;
@@ -44,7 +45,7 @@ stdenv.mkDerivation rec {
     uthash
 #    llvmPackages_10.bintools
     fftw
-#    tampi
+    tampi
     hdf5
     libgcc
     strace
diff --git a/bsc/tampi/default.nix b/bsc/tampi/default.nix
index c9f9cec..4f60930 100644
--- a/bsc/tampi/default.nix
+++ b/bsc/tampi/default.nix
@@ -9,23 +9,20 @@
 , mpi
 , gcc}:
 
-let
-  inherit stdenv fetchurl;
+stdenv.mkDerivation rec {
   version = "1.0.1";
-in
-{
-    hello = stdenv.mkDerivation rec {
-    name = "tampi-${version}";
-    enableParallelBuilding = true;
-    buildInputs = [ automake autoconf libtool gnumake boost mpi gcc ];
-    #hardeningDisable = [ "format" ];
-    preConfigure = ''
-        autoreconf -fiv
-    '';
-    configureFlags = [ "--disable-mpi-mt-check" ];
-    src = fetchurl {
-      url = "https://github.com/bsc-pm/tampi/archive/v${version}.tar.gz";
-      sha256 = "8608a74325939d2a6b56e82f7f6788efbc67731e2d64793bac69475f5b4b9704";
-    };
+  name = "tampi-${version}";
+  enableParallelBuilding = true;
+  buildInputs = [ automake autoconf libtool gnumake boost mpi gcc ];
+  #hardeningDisable = [ "format" ];
+  preConfigure = ''
+      autoreconf -fiv
+  '';
+
+  dontDisableStatic = true;
+  configureFlags = [ "--disable-mpi-mt-check" ];
+  src = fetchurl {
+    url = "https://github.com/bsc-pm/tampi/archive/v${version}.tar.gz";
+    sha256 = "8608a74325939d2a6b56e82f7f6788efbc67731e2d64793bac69475f5b4b9704";
   };
 }