diff --git a/.gitignore b/.gitignore
index 2d782ffc..81e5c73d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 result
 result-man
+outputs
diff --git a/local/pkgs/oneapi/default.nix b/local/pkgs/oneapi/default.nix
index 79dc962b..4387c004 100644
--- a/local/pkgs/oneapi/default.nix
+++ b/local/pkgs/oneapi/default.nix
@@ -1,19 +1,15 @@
 {
-	lib, stdenv, fetchurl, autoPatchelfHook
-	# glibc, zlib, file
-  # glibc, libX11, glib, libnotify, xdg-utils, ncurses, nss, 
-	# at-spi2-core, libxcb, libdrm, gtk3, mesa, qt515, zlib, xorg, atk, nspr, dbus,
-	# pango, cairo, gdk-pixbuf, cups, expat, libxkbcommon, alsaLib, file, at-spi2-atk,
-	# freetype, fontconfig
+	lib, stdenv, fetchurl, autoPatchelfHook,
+	ncurses, xorg
 }:
 	
 stdenv.mkDerivation rec
 {
 	version = "2023.1";
-	pname = "intel-oneapi";
+	pname = "oneapi";
 
 	sourceRoot = ".";
-	srcs = [
+	src = [
 		(fetchurl {
 			url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/7deeaac4-f605-4bcf-a81b-ea7531577c61/l_BaseKit_p_2023.1.0.46401_offline.sh";
 			sha256 = "0cn32zqfbjv0vq43g6ap10crnsyk7nldyqpyyzn6g52j5h45g93l";
@@ -23,8 +19,11 @@ stdenv.mkDerivation rec
 			sha256 = "0wfya02lljq4iid0nc5sn4055dkvgxwrc40x7qbgpdprzqx4a8l8";
 		})
 	];
+	basekit = "${builtins.elemAt src 0}";
+	hpckit = "${builtins.elemAt src 1}";
 
-	# nativeBuildInputs = [ file ];
+	nativeBuildInputs = [ autoPatchelfHook ];
+	propagatedBuildInputs = [ ncurses stdenv.cc.cc.lib xorg.libXau ];
 
 	# propagatedBuildInputs =
 	# [
@@ -45,57 +44,32 @@ stdenv.mkDerivation rec
 	# 	xorg.libXrandr
 	# ];
 
-	# phases = [ "installPhase" "fixupPhase" "installCheckPhase" "distPhase" ];
-
+	unpackPhase =
+		let
+			unpack = toolkit: "bash ${toolkit} --extract-only --extract-folder $TMP";
+		in
+		"
+			${unpack basekit}
+			${unpack hpckit}
+		";
+	patchPhase =
+		"
+			patchShebangs $TMP
+			autoPatchelf $TMP
+		";
 	installPhase =
-	''
-		cd $sourceRoot
-		mkdir -p $out/tmp
-		base_kit=$(echo $srcs|cut -d" " -f1)
-		hpc_kit=$(echo $srcs|cut -d" " -f2)
-		# Extract files
-		bash $base_kit --log $out/basekit_install_log --extract-only --extract-folder $out/tmp -a --install-dir $out \
-			--download-cache $out/tmp --download-dir $out/tmp --log-dir $out/tmp -s --eula accept
-		bash $hpc_kit --log $out/hpckit_install_log --extract-only --extract-folder $out/tmp -a --install-dir $out \
-			--download-cache $out/tmp --download-dir $out/tmp --log-dir $out/tmp -s --eula accept
-		for file in `grep -l -r "/bin/sh" $out/tmp`
-		do
-			sed -e "s,/bin/sh,${stdenv.shell},g" -i $file
-		done
-		export HOME=$out
-		# Patch the bootstraper binaries and libs
-		for files in `find $out/tmp/l_BaseKit_p_${version}_offline/lib`
-		do
-			patchelf --set-rpath "${glibc}/lib:$libPath:$out/tmp/l_BaseKit_p_${version}_offline/lib" $file 2>/dev/null || true
-		done
-		patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${glibc}/lib:$libPath:$out/tmp/l_BaseKit_p_${version}_offline/lib" $out/tmp/l_BaseKit_p_${version}_offline/bootstrapper
-		# launch install
-		export LD_LIBRARY_PATH=${zlib}/lib
-		$out/tmp/l_BaseKit_p_${version}_offline/install.sh --install-dir $out --download-cache $out/tmp \
-			--download-dir $out/tmp --log-dir $out/tmp --eula accept -s --ignore-errors
-		$out/tmp/l_HPCKit_p_${version}_offline/install.sh --install-dir $out --download-cache $out/tmp --download-dir $out/tmp --log-dir $out/tmp --eula accept -s --ignore-errors
-		rm -rf $out/tmp
-	'';
-
-	# postFixup = ''
-	# 	echo "Fixing rights..."
-	# 	chmod u+w -R $out
-	# 	echo "Patching rpath and interpreter..."
-	# 	for dir in `find $out -mindepth 1 -maxdepth 1 -type d`
-	# 	do
-	# 		echo "	 $dir"
-	# 		for file in `find $dir -type f -exec file {} + | grep ELF| awk -F: '{print $1}'`
-	# 		do
-	# 				echo "			 $file"
-	# 				patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath '$ORIGIN'":${glibc}/lib:$libPath:$dir/latest/lib64" $file 2>/dev/null || true
-	# 		done
-	# 	done
-	# '';
-
-	meta = {
-		description = "Intel OneAPI Basekit + HPCKit";
-		maintainers = [ lib.maintainers.bzizou ];
-		platforms = lib.platforms.linux;
-		license = lib.licenses.unfree;
-	};
+		let
+			install = toolkit:
+			"
+				export HOME=$TMP
+				toolkit_name=$(basename ${toolkit} | sed -e 's/\.sh//g' | sed -e 's/.*-//g')
+				$TMP/\${toolkit_name}/install.sh --install-dir $out --eula accept -s
+			";
+		in
+		"
+			runHook preInstall
+			${install basekit}
+			${install hpckit}
+			runHook postInstall
+		";
 }
\ No newline at end of file