Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'

1 files changed, 8 insertions, 5 deletions

diff --git a/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix b/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix
index b7d5d79544e1..16a9e3e79d45 100644
--- a/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -1,6 +1,9 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, blas
+{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, blas, lapack
 , gmpxx
 }:
+
+assert (!blas.is64bit) && (!lapack.is64bit);
+
 stdenv.mkDerivation rec {
   pname = "fflas-ffpack";
   version = "2.4.3";
@@ -23,11 +26,11 @@ stdenv.mkDerivation rec {
     pkgconfig
   ] ++ stdenv.lib.optionals doCheck checkInputs;
 
-  buildInputs = [ givaro blas ];
+  buildInputs = [ givaro blas lapack ];
 
   configureFlags = [
-    "--with-blas-libs=-l${blas.linkName}"
-    "--with-lapack-libs=-l${blas.linkName}"
+    "--with-blas-libs=-lcblas"
+    "--with-lapack-libs=-llapacke"
   ] ++ stdenv.lib.optionals stdenv.isx86_64 {
     # disable SIMD instructions (which are enabled *when available* by default)
     # for now we need to be careful to disable *all* relevant versions of an instruction set explicitly (https://github.com/linbox-team/fflas-ffpack/issues/284)
@@ -49,6 +52,6 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ raskin timokau ];
     platforms = platforms.unix;
-    homepage = https://linbox-team.github.io/fflas-ffpack/;
+    homepage = "https://linbox-team.github.io/fflas-ffpack/";
   };
 }