Merge pull request #14975 from FRidh/pythonblas

Python: don't propagate blas
This commit is contained in:
Frederik Rietdijk
2016-04-25 18:00:36 +02:00
3 changed files with 8 additions and 8 deletions

View File

@@ -9,8 +9,8 @@ in buildPythonPackage (args // rec {
name = "numpy-${version}";
disabled = isPyPy;
buildInputs = args.buildInputs or [ gfortran nose ];
propagatedBuildInputs = args.propagatedBuildInputs or [ passthru.blas ];
buildInputs = args.buildInputs or [ gfortran nose passthru.blas ];
propagatedBuildInputs = args.propagatedBuildInputs or [ ];
preConfigure = ''
sed -i 's/-faltivec//' numpy/distutils/system_info.py

View File

@@ -9,8 +9,8 @@ in buildPythonPackage (args // rec {
name = "scipy-${version}";
buildInputs = (args.buildInputs or [ gfortran nose ]);
propagatedBuildInputs = (args.propagatedBuildInputs or [ passthru.blas numpy]);
buildInputs = (args.buildInputs or [ gfortran nose passthru.blas ]);
propagatedBuildInputs = (args.propagatedBuildInputs or [ numpy]);
preConfigure = ''
sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py