From 5c2d9fe67c77b0618f2c3027d8117ca4c1e8c456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Mon, 19 May 2025 18:21:03 +0200 Subject: [PATCH] intel: reorder wrapper isystems --- pkgs/intel-oneapi/patch_intel.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/intel-oneapi/patch_intel.nix b/pkgs/intel-oneapi/patch_intel.nix index ae43fd0..b726ca5 100644 --- a/pkgs/intel-oneapi/patch_intel.nix +++ b/pkgs/intel-oneapi/patch_intel.nix @@ -55,6 +55,12 @@ let echo "--gcc-toolchain=${gcc.cc}" >> $out/nix-support/libcxx-cxxflags + # For some reason, If we don't resolve the realpath things go wrong + for stddef in ${cc}/lib/clang/*/include/stddef.h ; do + dir=$(dirname $(realpath "$stddef")) + echo "-isystem $dir" >> $out/nix-support/cc-cflags + done + for dir in ${gcc.cc}/include/c++/*; do echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags done @@ -68,12 +74,6 @@ let # Disable hardening by default echo "" > $out/nix-support/add-hardening.sh - # For some reason, If we don't resolve the realpath things go wrong - for stddef in ${cc}/lib/clang/*/include/stddef.h ; do - dir=$(dirname $(realpath "$stddef")) - echo "-isystem $dir" >> $out/nix-support/cc-cflags - done - '' + extraBuildCommands; } // (removeAttrs args ["cc" "extraBuildCommands" "extraInstall"]) ).overrideAttrs (old: {