diff --git a/bsc/llvm-ompss2/default.nix b/bsc/llvm-ompss2/default.nix
index b5ca5c9..e5653a4 100644
--- a/bsc/llvm-ompss2/default.nix
+++ b/bsc/llvm-ompss2/default.nix
@@ -3,19 +3,36 @@
 , fetchgit
 , cmake
 , lld
+, bash
+, python3
+, perl
+, clang
+, which
 }:
 
 stdenv.mkDerivation rec {
   version = "10.0.0";
   name = "llvm-ompss2-${version}";
   enableParallelBuilding = true;
-  buildInputs = [ cmake lld ];
-  preConfigure = ''
-      ls
-      mkdir llvm-build
-      cd llvm-build
-      ../utils/OmpSs/setup-cmake.sh
+  buildInputs = [ which clang bash python3 perl cmake lld ];
+  #preConfigure = ''
+  #  ls
+  #  cmakeFlagsArray=(
+  #    "-DCMAKE_C_COMPILER=mpicc"
+  #    "-DCMAKE_CXX_COMPILER=mpic++"
+  #  )
+  #'';
+
+  # FIXME: The setup script installs into /build/source/llvm-install
+  configurePhase = ''
+    mkdir llvm-build
+    cd llvm-build
+    env bash ../utils/OmpSs/setup-cmake.sh
   '';
-  src = "./llvm-mono/";
-  #dontUnpack = true;
+
+  src = builtins.fetchGit {
+    url = "git@bscpm02.bsc.es:llvm-ompss/llvm-mono.git";
+    rev = "38e2e6aac04d40b6b2823751ce25f6b414f52263";
+    ref = "master";
+  };
 }
diff --git a/default.nix b/default.nix
index 8201244..0af507e 100644
--- a/default.nix
+++ b/default.nix
@@ -21,11 +21,11 @@ let
     #stdenv = pkgs.gcc10Stdenv;
     stdenv = pkgs.clangStdenv;
 
-    extrae = callPackage ./bsc/extrae {
+    extrae = callPackage ./bsc/extrae/default.nix {
       mpi = mpi;
     };
 
-    tampi = callPackage ./bsc/tampi {
+    tampi = callPackage ./bsc/tampi/default.nix {
       mpi = mpi;
     };
 
@@ -37,6 +37,6 @@ let
       extrae = extrae;
     };
 
-    #llvm-ompss2 = callPackage ./bsc/llvm-ompss2 { };
+    llvm-ompss2 = callPackage ./bsc/llvm-ompss2/default.nix { };
   };
 in pkgs // self