From e4d10fa807bb6cb3e0b5f423d561bb2d9f60a072 Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 13 Apr 2025 22:30:24 +0800 Subject: [PATCH] mpiCheckPhaseHook: change HYDRA_IFACE to lo0 on Darwin platform --- pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh | 2 +- pkgs/by-name/mp/mpiCheckPhaseHook/package.nix | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh b/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh index 6adad2b44076..77d7290e2ec1 100644 --- a/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh +++ b/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh @@ -61,7 +61,7 @@ setupMpiCheck() { ;; MPICH) # Fix to make mpich run in a sandbox - export HYDRA_IFACE=lo + export HYDRA_IFACE="@iface@" # Disable sysfs cpu topology directory discovery. export HWLOC_XMLFILE="@topology@" ;; diff --git a/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix b/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix index a49e8e338bea..c771e87376fa 100644 --- a/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix +++ b/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix @@ -1,9 +1,14 @@ -{ callPackage, makeSetupHook }: +{ + callPackage, + makeSetupHook, + stdenv, +}: makeSetupHook { name = "mpi-checkPhase-hook"; substitutions = { + iface = if stdenv.hostPlatform.isDarwin then "lo0" else "lo"; topology = ./topology.xml; }; } ./mpi-check-hook.sh