diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-28 22:05:36 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-28 22:05:36 +0200 |
| commit | 03de4c02fbd35d1b730ba0957f71df9a7a82bacf (patch) | |
| tree | 78ed2f7dfa2efae85c9a76dd53320d875a8ff678 /pkgs/development/libraries/openmpi/default.nix | |
| parent | 99d25675152f30caf6354db93f01fac87f640c8f (diff) | |
| parent | e27e3ae169d4ac64856befb6bbf044f2153e337d (diff) | |
| download | nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar.gz nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar.bz2 nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar.lz nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar.xz nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar.zst nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/openmpi/default.nix')
| -rw-r--r-- | pkgs/development/libraries/openmpi/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 627ac68d68d7..38041e6b5d80 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, gfortran, perl, libnl -, rdma-core, zlib, numactl, libevent, hwloc, pkgsTargetTarget, symlinkJoin +, rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin , libpsm2, libfabric # Enable CUDA support @@ -75,16 +75,16 @@ in stdenv.mkDerivation rec { # default compilers should be indentical to the # compilers at build time - sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc:' \ + sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' \ $out/share/openmpi/mpicc-wrapper-data.txt - sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc:' \ + sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' \ $out/share/openmpi/ortecc-wrapper-data.txt - sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++:' \ + sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++:' \ $out/share/openmpi/mpic++-wrapper-data.txt - sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.gfortran}/bin/${pkgsTargetTarget.gfortran.targetPrefix}gfortran:' \ + sed -i 's:compiler=.*:compiler=${gfortran}/bin/${gfortran.targetPrefix}gfortran:' \ $out/share/openmpi/mpifort-wrapper-data.txt ''; |