diff --git a/flake/src.nix b/flake/src.nix
index 0fde0b6a..cea54038 100644
--- a/flake/src.nix
+++ b/flake/src.nix
@@ -114,12 +114,23 @@
   mathematica = pkgs.mathematica.src;
   oneapi =
   {
-      src = pkgs.fetchurl
+    src = pkgs.fetchurl
     {
       url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/2cf9c083-82b5-4a8f-a515-c599b09dcefc/"
         + "intel-oneapi-hpc-toolkit-2025.1.1.40_offline.sh";
       sha256 = "1qjy9dsnskwqsk66fm99b3cch1wp3rl9dx7y884p3x5kwiqdma2x";
     };
     version = "2025.1";
+    fullVersion = "2025.1.1.40";
+    components =
+    [
+      "intel.oneapi.lin.dpcpp-cpp-common,v=2025.1.1+10"
+      "intel.oneapi.lin.dpcpp-cpp-common.runtime,v=2025.1.1+10"
+      "intel.oneapi.lin.ifort-compiler,v=2025.1.1+10"
+      "intel.oneapi.lin.compilers-common.runtime,v=2025.1.1+10"
+      "intel.oneapi.lin.mpi.runtime,v=2021.15.0+493"
+      "intel.oneapi.lin.umf,v=0.10.0+355"
+      "intel.oneapi.lin.tbb.runtime,v=2022.1.0+425"
+    ];
   };
 }
diff --git a/packages/oneapi/stdenv.nix b/packages/oneapi/stdenv.nix
index f3751581..a156d8e1 100644
--- a/packages/oneapi/stdenv.nix
+++ b/packages/oneapi/stdenv.nix
@@ -1,38 +1,41 @@
 {
   src, stdenv, autoPatchelfHook, wrapCCWith, config, overrideCC, makeSetupHook, writeScript, overrideInStdenv,
   runCommand,
-  gcc, glibc, libz, zstd, libxml2, flock, numactl, ncurses, openssl, gmp, kdePackages,
-  libxcrypt-legacy, libfabric, rdma-core, xorg, bash
+  gcc, glibc, zlib, zstd, libxml2, flock, numactl, ncurses, openssl, gmp, kdePackages,
+  libxcrypt-legacy, libfabric, rdma-core, xorg, bash, p7zip, hwloc
 }:
 let
   oneapi = stdenv.mkDerivation
   {
     pname = "oneapi";
     inherit (src) src version;
-    buildInputs = [];
-    nativeBuildInputs = [ ncurses stdenv.cc.cc autoPatchelfHook ];
+    buildInputs = [ zlib stdenv.cc.cc hwloc ];
+    nativeBuildInputs = [ autoPatchelfHook p7zip ];
     langFortran = true;
+    dontUnpack = true;
     dontConfigure = true;
     dontBuild = true;
-    unpackPhase =
-    ''
-      mkdir installer
-      sh ${src.src} --extract-only --extract-folder installer
-      addAutoPatchelfSearchPath installer/intel*/lib
-      autoPatchelf installer/intel*/bootstrapper
-    '';
     installPhase =
+      let installComponents = builtins.concatStringsSep "\n" (builtins.map
+        (component:
+        ''
+          pushd ${component}
+            7za x cupPayload.cup
+            cp -r _installdir/* ../../../../install
+          popd
+        '')
+        src.components);
+      in
     ''
-      mkdir -p $out/install
-      export HOME=$out
-      echo "will install to $out/install"
-      sh installer/intel*/install.sh --silent --eula accept --install-dir $out/install
-      mv $out/install/compiler/${src.version}/{bin,include,lib,share,opt/compiler/include} $out
-      mv $out/bin/compiler/* $out/bin
-      rm -rf $out/install
-      # addAutoPatchelfSearchPath
+      mkdir -p installer install $out
+      sh ${src.src} --extract-only --extract-folder installer
+      pushd installer/intel-oneapi-hpc-toolkit-${src.fullVersion}_offline/packages
+        ${installComponents}
+      popd
+      cp -r install/compiler/${src.version}/{bin,include,lib,share} $out
+      cp -r install/{mpi,tbb,umf}/*/lib $out
     '';
-    autoPatchelfIgnoreMissingDeps = [];
+    autoPatchelfIgnoreMissingDeps = [ "libze_loader.so.1" "libcuda.so.1" "libhwloc.so.5" ];
     passthru = { inherit src; };
   };
   wrapper = (wrapCCWith