diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-13 11:53:06 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-13 17:18:49 +0000 |
| commit | c3e005913d59b8ad64004e60888a71816688af1f (patch) | |
| tree | f65b32f0d16acaa40f2ee82ac736d150de4b6cf5 /nixpkgs/pkgs/development/libraries/fftw | |
| parent | 1c8034da05499ca3d999f57ba1f6b235e7711ee1 (diff) | |
| parent | db88608d8c811a93b74c99cfa1224952afc78200 (diff) | |
| download | nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.gz nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.bz2 nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.lz nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.xz nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.zst nixlib-c3e005913d59b8ad64004e60888a71816688af1f.zip | |
Merge commit 'db88608d8c811a93b74c99cfa1224952afc78200'
Conflicts: nixpkgs/nixos/modules/config/update-users-groups.pl
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/fftw')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/fftw/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/fftw/default.nix b/nixpkgs/pkgs/development/libraries/fftw/default.nix index b2189b77bf76..37a7f1ce8fe4 100644 --- a/nixpkgs/pkgs/development/libraries/fftw/default.nix +++ b/nixpkgs/pkgs/development/libraries/fftw/default.nix @@ -9,6 +9,8 @@ , enableAvx2 ? stdenv.hostPlatform.avx2Support , enableAvx512 ? stdenv.hostPlatform.avx512Support , enableFma ? stdenv.hostPlatform.fmaSupport +, enableMpi ? false +, mpi }: with lib; @@ -38,10 +40,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ gfortran ]; - buildInputs = lib.optionals stdenv.cc.isClang [ + buildInputs = optionals stdenv.cc.isClang [ # TODO: This may mismatch the LLVM version sin the stdenv, see #79818. llvmPackages.openmp - ]; + ] ++ optional enableMpi mpi; configureFlags = [ "--enable-shared" @@ -56,6 +58,7 @@ stdenv.mkDerivation { ++ optional enableAvx512 "--enable-avx512" ++ optional enableFma "--enable-fma" ++ [ "--enable-openmp" ] + ++ optional enableMpi "--enable-mpi" # doc generation causes Fortran wrapper generation which hard-codes gcc ++ optional (!withDoc) "--disable-doc"; |