diff --git a/pkgs/intel-oneapi/2023.nix b/pkgs/intel-oneapi/2023.nix index 539ddcd0..1c94ef2b 100644 --- a/pkgs/intel-oneapi/2023.nix +++ b/pkgs/intel-oneapi/2023.nix @@ -10,7 +10,7 @@ , zlib , autoPatchelfHook , libfabric -, gcc13 +, gcc , wrapCCWith }: @@ -33,8 +33,6 @@ let maintainers = with lib.maintainers.bsc; [ abonerib ]; }; - gcc = gcc13; - v = { hpckit = "2023.1.0"; compiler = "2023.1.0"; @@ -416,13 +414,14 @@ let wrapIntel = { cc, mygcc, extraBuild ? "", extraInstall ? "" }: let targetConfig = stdenv.targetPlatform.config; + gccVersion = builtins.concatStringsSep "." (lib.take 3 (builtins.splitVersion mygcc.version)); in (wrapCCWith { cc = cc; extraBuildCommands = '' echo "-isystem ${cc}/include" >> $out/nix-support/cc-cflags echo "-isystem ${cc}/include/intel64" >> $out/nix-support/cc-cflags - echo "-L${mygcc.cc}/lib/gcc/${targetConfig}/${mygcc.version}" >> $out/nix-support/cc-ldflags + echo "-L${mygcc.cc}/lib/gcc/${targetConfig}/${gccVersion}" >> $out/nix-support/cc-ldflags echo "-L${mygcc.cc.lib}/lib" >> $out/nix-support/cc-ldflags echo "-L${intel-compiler-shared}/lib" >> $out/nix-support/cc-ldflags echo "-L${cc}/lib" >> $out/nix-support/cc-ldflags