public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #47355 from obsidiansystems/numpy-fortran

Browse Source 
numpy, scipy: Fix some nativeBuildInputs
This commit is contained in:
John Ericson 2018-09-25 14:45:40 -04:00 committed by GitHub
commit 8cbf56058a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/python-modules/numpy/default.nix
View File

@ -11,7 +11,8 @@ buildPythonPackage rec {
}; };
disabled = isPyPy; disabled = isPyPy;
buildInputs = [ gfortran pytest blas ]; nativeBuildInputs = [ gfortran pytest ];
buildInputs = [ blas ];
patches = lib.optionals (python.hasDistutilsCxxPatch or false) [ patches = lib.optionals (python.hasDistutilsCxxPatch or false) [
# We patch cpython/distutils to fix https://bugs.python.org/issue1222585 # We patch cpython/distutils to fix https://bugs.python.org/issue1222585

3
pkgs/development/python-modules/scipy/default.nix
View File

@ -10,7 +10,8 @@ buildPythonPackage rec {
}; };
checkInputs = [ nose pytest ]; checkInputs = [ nose pytest ];
buildInputs = [ gfortran numpy.blas ]; nativeBuildInputs = [ gfortran ];
buildInputs = [ numpy.blas ];
propagatedBuildInputs = [ numpy ]; propagatedBuildInputs = [ numpy ];
# Remove tests because of broken wrapper # Remove tests because of broken wrapper