Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'

2 files changed, 12 insertions, 13 deletions

diff --git a/nixpkgs/pkgs/development/libraries/sundials/2.x.nix b/nixpkgs/pkgs/development/libraries/sundials/2.x.nix
index 12840b769403..08cbd52ba394 100644
--- a/nixpkgs/pkgs/development/libraries/sundials/2.x.nix
+++ b/nixpkgs/pkgs/development/libraries/sundials/2.x.nix
@@ -4,15 +4,13 @@
 , python
 # GNU Octave needs KLU for ODE solvers
 , suitesparse
-, liblapack
+, blas, lapack
 , gfortran
 , lapackSupport ? true }:
 
-let liblapackShared = liblapack.override {
-  shared = true;
-};
+assert (!blas.is64bit) && (!lapack.is64bit);
 
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "sundials";
   version = "2.7.0";
 
@@ -44,7 +42,7 @@ in stdenv.mkDerivation rec {
     "-DKLU_INCLUDE_DIR=${suitesparse}/include"
     "-DKLU_LIBRARY_DIR=${suitesparse}/lib"
     "-DLAPACK_ENABLE=ON"
-    "-DLAPACK_LIBRARIES=${liblapackShared}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary};${liblapackShared}/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}"
+    "-DLAPACK_LIBRARIES=${lapack}/lib/lapack${stdenv.hostPlatform.extensions.sharedLibrary};${blas}/lib/blas${stdenv.hostPlatform.extensions.sharedLibrary}"
   ];
 
   # flaky tests, and patch in https://github.com/LLNL/sundials/pull/21 doesn't apply cleanly for sundials_3
@@ -53,7 +51,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Suite of nonlinear differential/algebraic equation solvers";
-    homepage    = https://computation.llnl.gov/projects/sundials;
+    homepage    = "https://computation.llnl.gov/projects/sundials";
     platforms   = platforms.all;
     maintainers = with maintainers; [ flokli idontgetoutmuch ];
     license     = licenses.bsd3;
diff --git a/nixpkgs/pkgs/development/libraries/sundials/default.nix b/nixpkgs/pkgs/development/libraries/sundials/default.nix
index fb6f773459eb..8ed8d6cfcb55 100644
--- a/nixpkgs/pkgs/development/libraries/sundials/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sundials/default.nix
@@ -2,17 +2,18 @@
 , cmake
 , fetchurl
 , python
-, openblas
+, blas
+, lapack
 , gfortran
 , lapackSupport ? true }:
 
-let openblas32 = openblas.override { blas64 = false; };
+assert (!blas.is64bit) && (!lapack.is64bit);
 
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "sundials";
   version = "5.1.0";
 
-  buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran openblas32 ];
+  buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran blas lapack ];
   nativeBuildInputs = [ cmake ];
 
   src = fetchurl {
@@ -33,7 +34,7 @@ in stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optionals (lapackSupport) [
     "-DSUNDIALS_INDEX_TYPE=int32_t"
     "-DLAPACK_ENABLE=ON"
-    "-DLAPACK_LIBRARIES=${openblas32}/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary}"
+    "-DLAPACK_LIBRARIES=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}"
   ];
 
   doCheck = true;
@@ -41,7 +42,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Suite of nonlinear differential/algebraic equation solvers";
-    homepage    = https://computation.llnl.gov/projects/sundials;
+    homepage    = "https://computation.llnl.gov/projects/sundials";
     platforms   = platforms.all;
     maintainers = with maintainers; [ flokli idontgetoutmuch ];
     license     = licenses.bsd3;