packages.oneapi: fix

flake/src.nix

@@ -140,10 +140,14 @@
     };
   };
   mathematica = pkgs.mathematica.src;
-  oneapi = pkgs.fetchurl
+  oneapi =
   {
-    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";
+      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";
   };
 }

packages/oneapi/stdenv.nix

@@ -1,23 +1,33 @@
 {
   src, stdenv, autoPatchelfHook, wrapCCWith, config, overrideCC, makeSetupHook, writeScript, overrideInStdenv,
-  gcc, glibc, libz, zstd, libxml2, flock, numactl, ncurses, openssl, gmp,
+  runCommand,
+  gcc, glibc, libz, zstd, libxml2, flock, numactl, ncurses, openssl, gmp, kdePackages,
   libxcrypt-legacy, libfabric, rdma-core, xorg, bash
 }:
 let
   oneapi = stdenv.mkDerivation
   {
     pname = "oneapi";
-    inherit src;
+    inherit (src) src version;
     buildInputs = [];
-    nativeBuildInputs = [ autoPatchelfHook ];
+    nativeBuildInputs = [ ncurses stdenv.cc.cc autoPatchelfHook ];
     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 =
     ''
-      sh $src -a --silent --eula accept --install-dir $out/install
-      mv $out/install/compiler/2025.1/{bin,include,lib,share,opt/compiler/include} $out
+      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