Fix osu cross-compilation

Set mpich default compilers from targetPackages
2025-10-31 11:57:11 +01:00 · 2025-10-31 11:57:11 +01:00
2 changed files with 2 additions and 2 deletions
--- a/pkgs/mpich/default.nix
+++ b/pkgs/mpich/default.nix
@ -47,7 +47,7 @@ in mpich.overrideAttrs (old: {

  preFixup = ''
    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
+    sed -i 's:^CXX=.*:CXX=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++:' $out/bin/mpicxx
  '' + lib.optionalString enableFortran ''
    sed -i 's:^FC=.*:FC=${targetPackages.gfortran or gfortran}/bin/${targetPackages.gfortran.targetPrefix or gfortran.targetPrefix}gfortran:' $out/bin/mpifort
  '';
--- a/pkgs/osu/default.nix
+++ b/pkgs/osu/default.nix
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {

  env = {
    MPICH_CC="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
-    MPICH_CXX="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}++";
+    MPICH_CXX="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++";
  };

  postInstall = ''
Author	SHA1	Message	Date
Aleix Boné	4752afae0c	Fix osu cross-compilation All checks were successful CI / build:cross (pull_request) Successful in 13m48s Details CI / build:all (pull_request) Successful in 20m1s Details	2025-10-31 11:57:11 +01:00
Aleix Boné	43865d8ba0	Set mpich default compilers from targetPackages	2025-10-31 11:57:11 +01:00