public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #85636 from matthewbauer/blas-lapack-fix-fallout-from-83888

Browse Source 
BLAS/LAPACK fix fallout from #83888
This commit is contained in:
Frederik Rietdijk
2020-04-21 19:59:16 +02:00
committed by GitHub
parent e7593313a6 3c41d61514
commit ec21df329a
35 changed files with 176 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/python-modules/cvxopt/default.nix
View File

@@ -14,7 +14,7 @@
, withFftw ? true
}:
assert (!blas.is64bit) && (!lapack.is64bit);
assert (!blas.isILP64) && (!lapack.isILP64);
buildPythonPackage rec {
pname = "cvxopt";

8
pkgs/development/python-modules/numpy/default.nix
View File

@@ -12,18 +12,16 @@
, setuptoolsBuildHook
}:
assert (!blas.is64bit) && (!lapack.is64bit);
assert (!blas.isILP64) && (!lapack.isILP64);
let
cfg = writeTextFile {
name = "site.cfg";
text = (lib.generators.toINI {} {
${blas.implementation} = {
include_dirs = "${blas}/include:${lapack}/include";
include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include";
library_dirs = "${blas}/lib:${lapack}/lib";
} // lib.optionalAttrs (blas.implementation == "mkl") {
mkl_libs = "mkl_rt";
lapack_libs = "";
libraries = "lapack,lapacke,blas,cblas";
};
});
};