diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-08-29 01:22:02 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-08-29 01:22:02 +0400 |
| commit | 0078bc5d8f87512104902eab00c8a44bef286067 (patch) | |
| tree | 13738ab296bf15b29f97effcc11fe40f6c621a81 /pkgs/tools | |
| parent | 121050046dc870df9015a700e0c01809974f928f (diff) | |
| parent | 1e0605738a94d834c97d6e7b9d1fc920f649facb (diff) | |
| download | nixlib-0078bc5d8f87512104902eab00c8a44bef286067.tar nixlib-0078bc5d8f87512104902eab00c8a44bef286067.tar.gz nixlib-0078bc5d8f87512104902eab00c8a44bef286067.tar.bz2 nixlib-0078bc5d8f87512104902eab00c8a44bef286067.tar.lz nixlib-0078bc5d8f87512104902eab00c8a44bef286067.tar.xz nixlib-0078bc5d8f87512104902eab00c8a44bef286067.tar.zst nixlib-0078bc5d8f87512104902eab00c8a44bef286067.zip | |
Merge pull request #3316 from aherrmann/pr_mpi
MPI support for HDF5 and SGE support for OpenMPI
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/hdf5/default.nix | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index a7d03d1335f0..5cdc468c2a5a 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -3,6 +3,8 @@ , fetchurl , zlib ? null , szip ? null +, mpi ? null +, enableShared ? true }: stdenv.mkDerivation rec { version = "1.8.13"; @@ -12,11 +14,23 @@ stdenv.mkDerivation rec { sha256 = "1h9qdl321gzm3ihdhlijbl9sh9qcdrw94j7izg64yfqhxj7b7xl2"; }; + passthru = { + mpiSupport = (mpi != null); + inherit mpi; + }; + buildInputs = [] ++ stdenv.lib.optional (zlib != null) zlib ++ stdenv.lib.optional (szip != null) szip; - configureFlags = if szip != null then "--with-szlib=${szip}" else ""; + propagatedBuildInputs = [] + ++ stdenv.lib.optional (mpi != null) mpi; + + configureFlags = " + ${if szip != null then "--with-szlib=${szip}" else ""} + ${if mpi != null then "--enable-parallel" else ""} + ${if enableShared then "--enable-shared" else ""} + "; patches = [./bin-mv.patch]; |