Commit f6f5a876 authored by Markus Kowalewski's avatar Markus Kowalewski
Browse files

octopus: fix build with scalapack 2.2.2

parent a381f040

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

+5 −0
Original line number Diff line number Diff line
@@ -40,6 +40,11 @@ stdenv.mkDerivation rec { 
    hash = "sha256-vG1HUkuNUZkhBumoJJy3AyFU6cZOo1YGmaOYcU6bPOM=";

  };



  patches = [

    # Discover all MPI languages components to avoid scalpack discovery failure

    ./scalapack-mpi-alias.patch

  ];



  nativeBuildInputs = [

    which

    perl

pkgs/by-name/oc/octopus/scalapack-mpi-alias.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/CMakeLists.txt b/CMakeLists.txt

index 70d89efb5e..47ba750d7a 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -131,7 +131,7 @@ set(Octopus_ext_libs)

 find_package(GSL)

 if (OCTOPUS_MPI)

 	set(MPI_DETERMINE_LIBRARY_VERSION ON)

-	find_package(MPI 3 COMPONENTS Fortran)

+	find_package(MPI 3)

 	# Further set MKL variables

 	if (MPI_Fortran_LIBRARY_VERSION_STRING MATCHES Intel)

 		set(MKL_MPI intelmpi CACHE STRING "Octopus: Overloaded")