From 6e27bab324ec1c6a394f319d1a7b575560bb1846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Fri, 31 Oct 2025 11:05:35 +0100 Subject: [PATCH] Set mpich default compilers from targetPackages --- pkgs/mpich/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/mpich/default.nix b/pkgs/mpich/default.nix index 595e6ad2..90d26b77 100644 --- a/pkgs/mpich/default.nix +++ b/pkgs/mpich/default.nix @@ -12,6 +12,7 @@ # For each arch , enableFortran ? stdenv.hostPlatform == stdenv.buildPlatform , perl +, targetPackages }: let @@ -45,10 +46,10 @@ in mpich.overrideAttrs (old: { ]; preFixup = '' - sed -i 's:^CC=.*:CC=gcc:' $out/bin/mpicc - sed -i 's:^CXX=.*:CXX=g++:' $out/bin/mpicxx + sed -i 's:^CC=.*:CC=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' $out/bin/mpicc + sed -i 's:^CXX=.*:CXX=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}++:' $out/bin/mpicxx '' + lib.optionalString enableFortran '' - sed -i 's:^FC=.*:FC=gfortran:' $out/bin/mpifort + sed -i 's:^FC=.*:FC=${targetPackages.gfortran or gfortran}/bin/${targetPackages.gfortran.targetPrefix or gfortran.targetPrefix}gfortran:' $out/bin/mpifort ''; hardeningDisable = [ "all" ];