diff options
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/python-modules/numpy.nix | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 39d98b37527e..a6eeee25be96 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -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; }; diff --git a/pkgs/development/python-modules/numpy.nix b/pkgs/development/python-modules/numpy.nix index d45342481594..14504d925438 100644 --- a/pkgs/development/python-modules/numpy.nix +++ b/pkgs/development/python-modules/numpy.nix @@ -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 |