diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-11-05 09:32:31 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-05 09:32:31 +0100 |
| commit | 480416cc0d7e508b652c516af8d7342e3b1e59e3 (patch) | |
| tree | d64d990b0d7cc1f80dca687b48563bc71628b55e /nixpkgs/pkgs/development/libraries/mvapich | |
| parent | 05f40ff2bfe9c68198664c38d65816f677ac7ed4 (diff) | |
| parent | fa804edfb7869c9fb230e174182a8a1a7e512c40 (diff) | |
| download | nixlib-480416cc0d7e508b652c516af8d7342e3b1e59e3.tar nixlib-480416cc0d7e508b652c516af8d7342e3b1e59e3.tar.gz nixlib-480416cc0d7e508b652c516af8d7342e3b1e59e3.tar.bz2 nixlib-480416cc0d7e508b652c516af8d7342e3b1e59e3.tar.lz nixlib-480416cc0d7e508b652c516af8d7342e3b1e59e3.tar.xz nixlib-480416cc0d7e508b652c516af8d7342e3b1e59e3.tar.zst nixlib-480416cc0d7e508b652c516af8d7342e3b1e59e3.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEAD
Conflicts: nixpkgs/pkgs/servers/pr-tracker/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mvapich')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/mvapich/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mvapich/default.nix b/nixpkgs/pkgs/development/libraries/mvapich/default.nix index 9c5046415e64..2182c4083376 100644 --- a/nixpkgs/pkgs/development/libraries/mvapich/default.nix +++ b/nixpkgs/pkgs/development/libraries/mvapich/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { "FFLAGS=-fallow-argument-mismatch" # fix build with gfortran 10 ] ++ optional useSlurm "--with-pm=slurm" ++ optional (network == "ethernet") "--with-device=ch3:sock" - ++ optionals (network == "infiniband") [ "--with-device=ch3:mrail" "--with-rdma=gen2" ] + ++ optionals (network == "infiniband") [ "--with-device=ch3:mrail" "--with-rdma=gen2" "--disable-ibv-dlopen" ] ++ optionals (network == "omnipath") ["--with-device=ch3:psm" "--with-psm2=${libpsm2}"]; doCheck = true; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { # /tmp/nix-build... ends up in the RPATH, fix it manually for entry in $out/bin/mpichversion $out/bin/mpivars; do echo "fix rpath: $entry" - patchelf --set-rpath "$out/lib" $entry + patchelf --allowed-rpath-prefixes ${builtins.storeDir} --shrink-rpath $entry done # Ensure the default compilers are the ones mvapich was built with |