From 3de966036bc2e374985397dfec4ff86e1faecdd8 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Tue, 4 Mar 2025 17:50:11 +0100 Subject: [PATCH] Fix mpich package --- pkgs/index.nix | 2 +- pkgs/mpich/default.nix | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/index.nix b/pkgs/index.nix index d8ac4977..ad7958b1 100644 --- a/pkgs/index.nix +++ b/pkgs/index.nix @@ -24,7 +24,7 @@ let #lmbench = callPackage ./lmbench/default.nix { }; # Broken mcxx = callPackage ./mcxx/default.nix { }; mpi = final.mpich; # Set MPICH as default - mpich = callPackage ./mpich/default.nix { }; + mpich = callPackage ./mpich/default.nix { mpich = prev.mpich; }; nanos6 = callPackage ./nanos6/default.nix { }; nanos6Debug = final.nanos6.override { enableDebug = true; }; nixtools = callPackage ./nixtools/default.nix { }; diff --git a/pkgs/mpich/default.nix b/pkgs/mpich/default.nix index ba6b24a0..67281dea 100644 --- a/pkgs/mpich/default.nix +++ b/pkgs/mpich/default.nix @@ -1,8 +1,10 @@ { - mpich + lib +, mpich , pmix , libfabric , gfortran +, symlinkJoin }: # Configure the OFI network for MPICH @@ -36,4 +38,4 @@ in mpich.overrideAttrs (old: { "FFLAGS=-fallow-argument-mismatch" # https://github.com/pmodels/mpich/issues/4300 "FCFLAGS=-fallow-argument-mismatch" ]; -}); +})