summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2020-08-26 21:14:53 -0500
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2020-09-04 20:10:53 +0200
commitb3d5272ff09503f1bfdf78326aa52350a4487245 (patch)
treec2158f78cad94d03639caada1db95b4c7066283d
parentfbaa330937afdb64caf85779ad67f136f5827261 (diff)
downloadnixpkgs-b3d5272ff09503f1bfdf78326aa52350a4487245.tar
nixpkgs-b3d5272ff09503f1bfdf78326aa52350a4487245.tar.gz
nixpkgs-b3d5272ff09503f1bfdf78326aa52350a4487245.tar.bz2
nixpkgs-b3d5272ff09503f1bfdf78326aa52350a4487245.tar.lz
nixpkgs-b3d5272ff09503f1bfdf78326aa52350a4487245.tar.xz
nixpkgs-b3d5272ff09503f1bfdf78326aa52350a4487245.tar.zst
nixpkgs-b3d5272ff09503f1bfdf78326aa52350a4487245.zip
numpy: set runtime_library_dirs too
This appears to be needed in some Python distutils for the library to
get on RPATH correctly. I’m not sure why this worked before, but I
needed this value set for Python 3.8 numpy to work correctly.
-rw-r--r--pkgs/development/python-modules/numpy/1.16.nix3
-rw-r--r--pkgs/development/python-modules/numpy/default.nix3
2 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/numpy/1.16.nix b/pkgs/development/python-modules/numpy/1.16.nix
index bde667900bc..6fa77d8fa90 100644
--- a/pkgs/development/python-modules/numpy/1.16.nix
+++ b/pkgs/development/python-modules/numpy/1.16.nix
@@ -21,15 +21,18 @@ let
       ${blas.implementation} = {
         include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include";
         library_dirs = "${blas}/lib:${lapack}/lib";
+        runtime_library_dirs = "${blas}/lib:${lapack}/lib";
         libraries = "lapack,lapacke,blas,cblas";
       };
       lapack = {
         include_dirs = "${lib.getDev lapack}/include";
         library_dirs = "${lapack}/lib";
+        runtime_library_dirs = "${lapack}/lib";
       };
       blas = {
         include_dirs = "${lib.getDev blas}/include";
         library_dirs = "${blas}/lib";
+        runtime_library_dirs = "${blas}/lib";
       };
     });
   };
diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index 98ba0b5c688..9502cdc5b0a 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -22,15 +22,18 @@ let
       ${blas.implementation} = {
         include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include";
         library_dirs = "${blas}/lib:${lapack}/lib";
+        runtime_library_dirs = "${blas}/lib:${lapack}/lib";
         libraries = "lapack,lapacke,blas,cblas";
       };
       lapack = {
         include_dirs = "${lib.getDev lapack}/include";
         library_dirs = "${lapack}/lib";
+        runtime_library_dirs = "${lapack}/lib";
       };
       blas = {
         include_dirs = "${lib.getDev blas}/include";
         library_dirs = "${blas}/lib";
+        runtime_library_dirs = "${blas}/lib";
       };
     });
   };