python312Packages.scipy: use numpy.coreIncludeDir (#340832)

NixOS · Sep 10, 2024 · a7e00d2 · a7e00d2
2 parents 7603fd7 + a63b474
commit a7e00d2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/pkgs/development/python-modules/numpy/1.nix b/pkgs/development/python-modules/numpy/1.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchPypi,
   python,
+  numpy_1,
   pythonAtLeast,
   pythonOlder,
   buildPythonPackage,
@@ -185,6 +186,7 @@ buildPythonPackage rec {
     blas = blas.provider;
     blasImplementation = blas.implementation;
     inherit cfg;
+    coreIncludeDir = "${numpy_1}/${python.sitePackages}/numpy/core/include";
     tests = {
       inherit sage;
     };

diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchPypi,
   python,
+  numpy_2,
   pythonAtLeast,
   pythonOlder,
   buildPythonPackage,
@@ -166,6 +167,7 @@ buildPythonPackage rec {
     blas = blas.provider;
     blasImplementation = blas.implementation;
     inherit cfg;
+    coreIncludeDir = "${numpy_2}/${python.sitePackages}/numpy/_core/include";
     tests = {
       inherit sage;
     };

diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
@@ -65,7 +65,7 @@ let
   # Additional cross compilation related properties that scipy reads in scipy/meson.build
   crossFileScipy = writeText "cross-file-scipy.conf" ''
     [properties]
-    numpy-include-dir = '${numpy}/${python.sitePackages}/numpy/core/include'
+    numpy-include-dir = '${numpy.coreIncludeDir}'
     pythran-include-dir = '${pythran}/${python.sitePackages}/pythran'
     host-python-path = '${python.interpreter}'
     host-python-version = '${python.pythonVersion}'