Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'

1 files changed, 8 insertions, 7 deletions

diff --git a/nixpkgs/pkgs/development/libraries/qrupdate/default.nix b/nixpkgs/pkgs/development/libraries/qrupdate/default.nix
index 3e0dc99f81fc..f6c16583ad75 100644
--- a/nixpkgs/pkgs/development/libraries/qrupdate/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qrupdate/default.nix
@@ -1,23 +1,24 @@
 { stdenv
 , fetchurl
 , gfortran
-, openblas
+, blas
+, lapack
 }:
 stdenv.mkDerivation {
   name = "qrupdate-1.1.2";
   src = fetchurl {
-    url = mirror://sourceforge/qrupdate/qrupdate-1.1.2.tar.gz ;
+    url = "mirror://sourceforge/qrupdate/qrupdate-1.1.2.tar.gz";
     sha256 = "024f601685phcm1pg8lhif3lpy5j9j0k6n0r46743g4fvh8wg8g2";
   };
 
   configurePhase =
     ''
       export PREFIX=$out
-      sed -i -e 's,^BLAS=.*,BLAS=-L${openblas}/lib -lopenblas,' \
-          -e 's,^LAPACK=.*,LAPACK=-L${openblas}/lib -lopenblas,' \
+      sed -i -e 's,^BLAS=.*,BLAS=-L${blas}/lib -lblas,' \
+          -e 's,^LAPACK=.*,LAPACK=-L${lapack}/lib -llapack,' \
           Makeconf
     ''
-    + stdenv.lib.optionalString openblas.blas64
+    + stdenv.lib.optionalString blas.is64bit
     ''
       sed -i Makeconf -e '/^FFLAGS=.*/ s/$/-fdefault-integer-8/'
     '';
@@ -30,11 +31,11 @@ stdenv.mkDerivation {
 
   installTargets = stdenv.lib.optionals stdenv.isDarwin [ "install-staticlib" "install-shlib" ];
 
-  buildInputs = [ gfortran openblas ];
+  buildInputs = [ gfortran blas lapack ];
 
   meta = with stdenv.lib; {
     description = "Library for fast updating of qr and cholesky decompositions";
-    homepage = https://sourceforge.net/projects/qrupdate/;
+    homepage = "https://sourceforge.net/projects/qrupdate/";
     license = licenses.gpl3;
     platforms = platforms.unix;
   };