mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
pkgs.hdf5: Fix mpi build
@vcunat fixed the assertion (which was his wrong suggestion).
This commit is contained in:
parent
4d28d46c45
commit
afa9e26130
|
@ -8,7 +8,11 @@
|
||||||
, enableShared ? true
|
, 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 {
|
stdenv.mkDerivation rec {
|
||||||
version = "1.8.16";
|
version = "1.8.16";
|
||||||
|
@ -35,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||||
++ optional cpp "--enable-cxx"
|
++ optional cpp "--enable-cxx"
|
||||||
++ optional (gfortran != null) "--enable-fortran"
|
++ optional (gfortran != null) "--enable-fortran"
|
||||||
++ optional (szip != null) "--with-szlib=${szip}"
|
++ optional (szip != null) "--with-szlib=${szip}"
|
||||||
++ optional (mpi != null) "--enable-parallel"
|
++ optionals (mpi != null) ["--enable-parallel" "CC=${mpi}/bin/mpicc"]
|
||||||
++ optional enableShared "--enable-shared";
|
++ optional enableShared "--enable-shared";
|
||||||
|
|
||||||
patches = [./bin-mv.patch];
|
patches = [./bin-mv.patch];
|
||||||
|
|
Loading…
Reference in a new issue