JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pkgs.hdf5: Fix mpi build

Browse Source 
@vcunat fixed the assertion (which was his wrong suggestion).
This commit is contained in:
Lancelot SIX 2015-11-20 09:59:22 +00:00 committed by Vladimír Čunát
parent 4d28d46c45
commit afa9e26130
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/misc/hdf5/default.nix
View File

@ -8,7 +8,11 @@
, enableShared ? true
}:
with { inherit (stdenv.lib) optional; };
# cpp and mpi options are mutually exclusive
# (--enable-unsupported could be used to force the build)
assert !cpp || mpi == null;
with { inherit (stdenv.lib) optional optionals; };
stdenv.mkDerivation rec {
version = "1.8.16";
@ -35,7 +39,7 @@ stdenv.mkDerivation rec {
++ optional cpp "--enable-cxx"
++ optional (gfortran != null) "--enable-fortran"
++ optional (szip != null) "--with-szlib=${szip}"
++ optional (mpi != null) "--enable-parallel"
++ optionals (mpi != null) ["--enable-parallel" "CC=${mpi}/bin/mpicc"]
++ optional enableShared "--enable-shared";
patches = [./bin-mv.patch];