summary refs log tree commit diff
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2016-01-17 12:59:05 +0100
committerDomen Kožar <domen@dev.si>2016-01-17 12:59:05 +0100
commite16ed8c579b361d7d270a2986fcafab96fc5eb7b (patch)
treecae6247df22fb6f6f6b3d14e839ccc6048002e72
parent07dcea52e6e999b6b30f71e4f7f01de0e2fbc302 (diff)
parentfea89d6bc3c78a272ee9cfac18213772ba8833e3 (diff)
downloadnixlib-e16ed8c579b361d7d270a2986fcafab96fc5eb7b.tar
nixlib-e16ed8c579b361d7d270a2986fcafab96fc5eb7b.tar.gz
nixlib-e16ed8c579b361d7d270a2986fcafab96fc5eb7b.tar.bz2
nixlib-e16ed8c579b361d7d270a2986fcafab96fc5eb7b.tar.lz
nixlib-e16ed8c579b361d7d270a2986fcafab96fc5eb7b.tar.xz
nixlib-e16ed8c579b361d7d270a2986fcafab96fc5eb7b.tar.zst
nixlib-e16ed8c579b361d7d270a2986fcafab96fc5eb7b.zip
Merge pull request #12287 from abbradar/openmpi
openmpi: 1.6.5 -> 1.10.1
-rw-r--r--pkgs/development/libraries/openmpi/default.nix29
1 files changed, 24 insertions, 5 deletions
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 7fe57af5710a..194a794235ab 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -1,25 +1,44 @@
-{stdenv, fetchurl, gfortran
+{stdenv, fetchurl, gfortran, perl
 
 # Enable the Sun Grid Engine bindings
 , enableSGE ? false
 
 # Pass PATH/LD_LIBRARY_PATH to point to current mpirun by default
 , enablePrefix ? false
+
+# Build static libraries
+, enableStatic ? false
 }:
 
 with stdenv.lib;
 
-stdenv.mkDerivation {
-  name = "openmpi-1.6.5";
+let
+  majorVersion = "1.10";
+
+in stdenv.mkDerivation rec {
+  name = "openmpi-${majorVersion}.1";
+
   src = fetchurl {
-    url = http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.5.tar.bz2 ;
-    sha256 = "11gws4d3z7934zna2r7m1f80iay2ha17kp42mkh39wjykfwbldzy";
+    url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2";
+    sha256 = "14p4px9a3qzjc22lnl6braxrcrmd9rgmy7fh4qpanawn2pgfq6br";
   };
+
   buildInputs = [ gfortran ];
+
+  nativeBuildInputs = [ perl ];
+
   configureFlags = []
     ++ optional enableSGE "--with-sge"
     ++ optional enablePrefix "--enable-mpirun-prefix-by-default"
+    ++ optional enableStatic "--enable-static"
     ;
+
+  enableParallelBuilding = true;
+
+  preBuild = ''
+    patchShebangs ompi/mpi/fortran/base/gen-mpi-sizeof.pl
+  '';
+
   meta = {
     homepage = http://www.open-mpi.org/;
     description = "Open source MPI-2 implementation";