Merge pull request #87235 from NixOS/staging-next

Staging next
2020-05-11 22:07:40 +02:00
parent 33a756f431 d20d734bcf
commit 82ca249c92
28 changed files with 958 additions and 51 deletions
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -23,6 +23,14 @@ let
        library_dirs = "${blas}/lib:${lapack}/lib";
        libraries = "lapack,lapacke,blas,cblas";
      };
+      lapack = {
+        include_dirs = "${lib.getDev lapack}/include";
+        library_dirs = "${lapack}/lib";
+      };
+      blas = {
+        include_dirs = "${lib.getDev blas}/include";
+        library_dirs = "${blas}/lib";
+      };
    });
  };
 in buildPythonPackage rec {