diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-02-26 23:32:33 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-02-26 23:32:33 +0000 |
| commit | 1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5 (patch) | |
| tree | cba73be7e3108dca51f75c9ec44a8bd61246b11a /nixpkgs/pkgs/development/libraries/globalarrays | |
| parent | db8291322dd83add2250dd4480b46298655cbfba (diff) | |
| parent | 1233c8d9e9bc463899ed6a8cf0232e6bf36475ee (diff) | |
| download | nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar.gz nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar.bz2 nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar.lz nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar.xz nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.tar.zst nixlib-1bf6dffc1145dcf54c2b60d8a72cd384de0ef0b5.zip | |
Merge commit '1233c8d9e9bc463899ed6a8cf0232e6bf36475ee'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/globalarrays')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/globalarrays/default.nix | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/globalarrays/default.nix b/nixpkgs/pkgs/development/libraries/globalarrays/default.nix index 2da5474eb9d1..269071434d57 100644 --- a/nixpkgs/pkgs/development/libraries/globalarrays/default.nix +++ b/nixpkgs/pkgs/development/libraries/globalarrays/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchFromGitHub, automake, autoconf, libtool +{ stdenv, fetchpatch, fetchFromGitHub, autoreconfHook , openblas, gfortran, openssh, openmpi } : @@ -15,11 +15,22 @@ in stdenv.mkDerivation { sha256 = "07i2idaas7pq3in5mdqq5ndvxln5q87nyfgk3vzw85r72c4fq5jh"; }; - nativeBuildInputs = [ automake autoconf libtool ]; + # upstream patches for openmpi-4 compatibility + patches = [ (fetchpatch { + name = "MPI_Type_struct-was-deprecated-in-MPI-2"; + url = "https://github.com/GlobalArrays/ga/commit/36e6458993b1df745f43b7db86dc17087758e0d2.patch"; + sha256 = "058qi8x0ananqx980p03yxpyn41cnmm0ifwsl50qp6sc0bnbnclh"; + }) + (fetchpatch { + name = "MPI_Errhandler_set-was-deprecated-in-MPI-2"; + url = "https://github.com/GlobalArrays/ga/commit/f1ea5203d2672c1a1d0275a012fb7c2fb3d033d8.patch"; + sha256 = "06n7ds9alk5xa6hd7waw3wrg88yx2azhdkn3cjs2k189iw8a7fqk"; + })]; + + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ openmpi openblas gfortran openssh ]; preConfigure = '' - autoreconf -ivf configureFlagsArray+=( "--enable-i8" \ "--with-mpi" \ "--with-mpi3" \ |