openmolcas: fix build w.r.t. openblas

Fall out from switching openblas over to multiple outputs:
https://github.com/NixOS/nixpkgs/pull/98337
This commit is contained in:
Markus Kowalewski 2020-10-19 14:00:48 +02:00
parent 7ef527cff8
commit 8b02ff6b8e
No known key found for this signature in database
GPG Key ID: 502A248E3FB4FF48
2 changed files with 18 additions and 2 deletions

View File

@ -23,7 +23,10 @@ in stdenv.mkDerivation {
sha256 = "1wwqhkyyi7pw5x1ghnp83ir17zl5jsj7phhqxapybyi3bmg0i00q";
};
patches = [ (fetchpatch {
patches = [
# Required to handle openblas multiple outputs
./openblasPath.patch
(fetchpatch {
name = "Fix-MPI-INT-size"; # upstream patch, fixes a Fortran compiler error
url = "https://gitlab.com/Molcas/OpenMolcas/commit/860e3350523f05ab18e49a428febac8a4297b6e4.patch";
sha256 = "0h96h5ikbi5l6ky41nkxmxfhjiykkiifq7vc2s3fdy1r1siv09sb";
@ -55,7 +58,7 @@ in stdenv.mkDerivation {
"-DTOOLS=ON"
"-DHDF5=ON"
"-DFDE=ON"
"-DOPENBLASROOT=${openblas}"
"-DOPENBLASROOT=${openblas.dev}"
];
GAROOT=globalarrays;

View File

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 055ff8ef..3f60279b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1436,7 +1436,7 @@ if (LINALG STREQUAL "OpenBLAS")
NAMES openblas
PATHS ${OPENBLASROOT}
PATH_SUFFIXES lib
- NO_DEFAULT_PATH)
+ )
if (NOT LIBOPENBLAS)
message (FATAL_ERROR