mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

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

Browse source
This commit is contained in:
Robert Schütz 2024-09-10 16:21:13 -07:00 committed by GitHub
parent 7603fd7f0c a63b47478e
commit a7e00d27ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/python-modules/numpy/1.nix
View file

@ -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;
};

2
pkgs/development/python-modules/numpy/2.nix
View file

@ -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;
};

2
pkgs/development/python-modules/scipy/default.nix
View file

@ -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}'