about summary refs log tree commit diff
path: root/pkgs/development/python-modules/cvxopt
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2020-03-31 10:47:18 -0400
committerMatthew Bauer <mjbauer95@gmail.com>2020-04-17 16:24:09 -0500
commit1c8aba83340be3713f68410d1d273a8b15e7e007 (patch)
treefdc752744f384be57b6ff3c65495018432bff0ab /pkgs/development/python-modules/cvxopt
parent43873351ffed36b52170571839e26b57c9f15920 (diff)
downloadnixlib-1c8aba83340be3713f68410d1d273a8b15e7e007.tar
nixlib-1c8aba83340be3713f68410d1d273a8b15e7e007.tar.gz
nixlib-1c8aba83340be3713f68410d1d273a8b15e7e007.tar.bz2
nixlib-1c8aba83340be3713f68410d1d273a8b15e7e007.tar.lz
nixlib-1c8aba83340be3713f68410d1d273a8b15e7e007.tar.xz
nixlib-1c8aba83340be3713f68410d1d273a8b15e7e007.tar.zst
nixlib-1c8aba83340be3713f68410d1d273a8b15e7e007.zip
treewide: use blas and lapack
This makes packages use lapack and blas, which can wrap different
BLAS/LAPACK implementations.

treewide: cleanup from blas/lapack changes

A few issues in the original treewide:

- can’t assume blas64 is a bool
- unused commented code
Diffstat (limited to 'pkgs/development/python-modules/cvxopt')
-rw-r--r--pkgs/development/python-modules/cvxopt/default.nix11
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix
index b48f6b991367..9266f406b151 100644
--- a/pkgs/development/python-modules/cvxopt/default.nix
+++ b/pkgs/development/python-modules/cvxopt/default.nix
@@ -4,7 +4,7 @@
 , fetchPypi
 , isPyPy
 , python
-, openblasCompat # build segfaults with regular openblas
+, blas, lapack # build segfaults with 64-bit blas
 , suitesparse
 , glpk ? null
 , gsl ? null
@@ -14,6 +14,8 @@
 , withFftw ? true
 }:
 
+assert (!blas.is64bit) && (!lapack.is64bit);
+
 buildPythonPackage rec {
   pname = "cvxopt";
   version = "1.2.4";
@@ -25,12 +27,13 @@ buildPythonPackage rec {
     sha256 = "1h9g79gxpgpy6xciqyypihw5q4ngp322lpkka1nkwk0ysybfsp7s";
   };
 
+  buildInputs = [ blas lapack ];
+
   # similar to Gsl, glpk, fftw there is also a dsdp interface
   # but dsdp is not yet packaged in nixpkgs
   preConfigure = ''
-    export CVXOPT_BLAS_LIB_DIR=${openblasCompat}/lib
-    export CVXOPT_BLAS_LIB=openblas
-    export CVXOPT_LAPACK_LIB=openblas
+    export CVXOPT_BLAS_LIB=blas
+    export CVXOPT_LAPACK_LIB=lapack
     export CVXOPT_SUITESPARSE_LIB_DIR=${lib.getLib suitesparse}/lib
     export CVXOPT_SUITESPARSE_INC_DIR=${lib.getDev suitesparse}/include
   '' + lib.optionalString withGsl ''