Skip to content

Commit f6f5a87

Browse files
committed
octopus: fix build with scalapack 2.2.2
1 parent a381f04 commit f6f5a87

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

pkgs/by-name/oc/octopus/package.nix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ stdenv.mkDerivation rec {
4040
hash = "sha256-vG1HUkuNUZkhBumoJJy3AyFU6cZOo1YGmaOYcU6bPOM=";
4141
};
4242

43+
patches = [
44+
# Discover all MPI languages components to avoid scalpack discovery failure
45+
./scalapack-mpi-alias.patch
46+
];
47+
4348
nativeBuildInputs = [
4449
which
4550
perl
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 70d89efb5e..47ba750d7a 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -131,7 +131,7 @@ set(Octopus_ext_libs)
6+
find_package(GSL)
7+
if (OCTOPUS_MPI)
8+
set(MPI_DETERMINE_LIBRARY_VERSION ON)
9+
- find_package(MPI 3 COMPONENTS Fortran)
10+
+ find_package(MPI 3)
11+
# Further set MKL variables
12+
if (MPI_Fortran_LIBRARY_VERSION_STRING MATCHES Intel)
13+
set(MKL_MPI intelmpi CACHE STRING "Octopus: Overloaded")

0 commit comments

Comments
 (0)