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

Merge pull request #19907 from veprbl/distutils_fix2

Browse Source 
numpy: enable numpy.distutils patch only if it's also in distutils
This commit is contained in:
Frederik Rietdijk 2016-10-27 13:38:06 +02:00 committed by GitHub
commit 600f4dd080
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/interpreters/python/cpython/2.7/default.nix
View File

@ -39,6 +39,7 @@ let
sha256 = "0y7rl603vmwlxm6ilkhc51rx2mfj14ckcz40xxgs0ljnvlhp30yp";
};
hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false);
patches =
[ # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
./search-path.patch
@ -82,7 +83,7 @@ let
./2.7.3-dylib.patch
./2.7.3-getpath-exe-extension.patch
./2.7.3-no-libm.patch
] ++ optionals (!(stdenv.cc.isGNU or false)) [
] ++ optionals hasDistutilsCxxPatch [
# Patch from http://bugs.python.org/issue1222585 adapted to work with
# `patch -p1' and with a last hunk removed
@ -180,7 +181,7 @@ in stdenv.mkDerivation {
'';
passthru = rec {
inherit libPrefix sitePackages x11Support;
inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch;
executable = libPrefix;
buildEnv = callPackage ../../wrapper.nix { python = self; };
withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python27Packages; };

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

@ -12,7 +12,7 @@ in buildPythonPackage (args // rec {
buildInputs = args.buildInputs or [ gfortran nose ];
propagatedBuildInputs = args.propagatedBuildInputs or [ passthru.blas ];
patches = lib.optionals isPy27 [
patches = lib.optionals (python.hasDistutilsCxxPatch or false) [
# See cpython 2.7 patches.
# numpy.distutils is used by cython during it's check phase
./numpy-distutils-C++.patch