diff options
| author | John Ericson <subscribe@JohnEricson.me> | 2018-09-25 14:45:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-25 14:45:40 -0400 |
| commit | 8cbf56058a6f628e69dfcd8f546bf0fbe967c062 (patch) | |
| tree | 2c51b693b0c531572b241440806bf3ab75af7bc4 /pkgs | |
| parent | c701d6cb21e1e83a82ebdefe180f2d6233087f4a (diff) | |
| parent | 84fc814982a3e35d74e292610d389d1a6aab549f (diff) | |
| download | nixlib-8cbf56058a6f628e69dfcd8f546bf0fbe967c062.tar nixlib-8cbf56058a6f628e69dfcd8f546bf0fbe967c062.tar.gz nixlib-8cbf56058a6f628e69dfcd8f546bf0fbe967c062.tar.bz2 nixlib-8cbf56058a6f628e69dfcd8f546bf0fbe967c062.tar.lz nixlib-8cbf56058a6f628e69dfcd8f546bf0fbe967c062.tar.xz nixlib-8cbf56058a6f628e69dfcd8f546bf0fbe967c062.tar.zst nixlib-8cbf56058a6f628e69dfcd8f546bf0fbe967c062.zip | |
Merge pull request #47355 from obsidiansystems/numpy-fortran
numpy, scipy: Fix some nativeBuildInputs
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/numpy/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/python-modules/scipy/default.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index af8815dbfb1b..c66650c0abf2 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -11,7 +11,8 @@ buildPythonPackage rec { }; disabled = isPyPy; - buildInputs = [ gfortran pytest blas ]; + nativeBuildInputs = [ gfortran pytest ]; + buildInputs = [ blas ]; patches = lib.optionals (python.hasDistutilsCxxPatch or false) [ # We patch cpython/distutils to fix https://bugs.python.org/issue1222585 diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 140e8cc80b4d..5fdffedc6f27 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -10,7 +10,8 @@ buildPythonPackage rec { }; checkInputs = [ nose pytest ]; - buildInputs = [ gfortran numpy.blas ]; + nativeBuildInputs = [ gfortran ]; + buildInputs = [ numpy.blas ]; propagatedBuildInputs = [ numpy ]; # Remove tests because of broken wrapper |