diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-03-22 06:58:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-22 06:58:25 +0100 |
commit | d951c534dae01be0f8fdd36c3bd88490b89a5a7d (patch) | |
tree | 9bf20f23c5b09fa372dad83e50c6711e6d134a0f /pkgs/development/python-modules/cvxopt/default.nix | |
parent | 81d84153c790ab80490139a01b60481cab7497a9 (diff) | |
parent | b552b84ae29628b2574da116b9736e90f12485df (diff) | |
download | nixlib-d951c534dae01be0f8fdd36c3bd88490b89a5a7d.tar nixlib-d951c534dae01be0f8fdd36c3bd88490b89a5a7d.tar.gz nixlib-d951c534dae01be0f8fdd36c3bd88490b89a5a7d.tar.bz2 nixlib-d951c534dae01be0f8fdd36c3bd88490b89a5a7d.tar.lz nixlib-d951c534dae01be0f8fdd36c3bd88490b89a5a7d.tar.xz nixlib-d951c534dae01be0f8fdd36c3bd88490b89a5a7d.tar.zst nixlib-d951c534dae01be0f8fdd36c3bd88490b89a5a7d.zip |
Merge pull request #82274 from jtojnar/suitesparese-5.6
suitesparse: 5.4.0 → 5.7.1 + clean up
Diffstat (limited to 'pkgs/development/python-modules/cvxopt/default.nix')
-rw-r--r-- | pkgs/development/python-modules/cvxopt/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index a842baca2289..fd44f49b53c9 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -31,8 +31,8 @@ buildPythonPackage rec { export CVXOPT_BLAS_LIB_DIR=${openblasCompat}/lib export CVXOPT_BLAS_LIB=openblas export CVXOPT_LAPACK_LIB=openblas - export CVXOPT_SUITESPARSE_LIB_DIR=${suitesparse}/lib - export CVXOPT_SUITESPARSE_INC_DIR=${suitesparse}/include + export CVXOPT_SUITESPARSE_LIB_DIR=${lib.getLib suitesparse}/lib + export CVXOPT_SUITESPARSE_INC_DIR=${lib.getDev suitesparse}/include '' + lib.optionalString withGsl '' export CVXOPT_BUILD_GSL=1 export CVXOPT_GSL_LIB_DIR=${gsl}/lib |