diff options
| author | Asko Soukka <asko.soukka@iki.fi> | 2015-11-01 14:55:06 +0200 |
|---|---|---|
| committer | Asko Soukka <asko.soukka@iki.fi> | 2015-11-01 14:58:45 +0200 |
| commit | 80fd9e96bea93dff46aa51abe8fe40f4a3e70408 (patch) | |
| tree | e1a8690ff1b396f43aa081664ac7fbebfad283bc /pkgs/development/python-modules/matplotlib | |
| parent | f933b48a53bf0284e1901a45325a3ae98050c1d7 (diff) | |
| download | nixlib-80fd9e96bea93dff46aa51abe8fe40f4a3e70408.tar nixlib-80fd9e96bea93dff46aa51abe8fe40f4a3e70408.tar.gz nixlib-80fd9e96bea93dff46aa51abe8fe40f4a3e70408.tar.bz2 nixlib-80fd9e96bea93dff46aa51abe8fe40f4a3e70408.tar.lz nixlib-80fd9e96bea93dff46aa51abe8fe40f4a3e70408.tar.xz nixlib-80fd9e96bea93dff46aa51abe8fe40f4a3e70408.tar.zst nixlib-80fd9e96bea93dff46aa51abe8fe40f4a3e70408.zip | |
darwin: matplotlib: update darwin patch for 1.5.0
Diffstat (limited to 'pkgs/development/python-modules/matplotlib')
| -rw-r--r-- | pkgs/development/python-modules/matplotlib/darwin-stdenv.patch | 19 | ||||
| -rw-r--r-- | pkgs/development/python-modules/matplotlib/default.nix | 3 |
2 files changed, 10 insertions, 12 deletions
diff --git a/pkgs/development/python-modules/matplotlib/darwin-stdenv.patch b/pkgs/development/python-modules/matplotlib/darwin-stdenv.patch index 6e780dfb5a0c..ca399b4e6841 100644 --- a/pkgs/development/python-modules/matplotlib/darwin-stdenv.patch +++ b/pkgs/development/python-modules/matplotlib/darwin-stdenv.patch @@ -1,11 +1,10 @@ ---- a/src/_macosx.m 2015-06-30 12:18:48.000000000 +0300 -+++ b/src/_macosx.m 2015-06-30 12:19:12.000000000 +0300 -@@ -5,6 +5,8 @@ - #include "numpy/arrayobject.h" - #include "path_cleanup.h" +--- a/src/_macosx.m 2015-10-30 00:46:20.000000000 +0200 ++++ b/src/_macosx.m 2015-11-01 14:52:25.000000000 +0200 +@@ -6264,6 +6264,7 @@ -+#define WITH_NEXT_FRAMEWORK 1 -+ - #if PY_MAJOR_VERSION >= 3 - #define PY3K 1 - #else + static bool verify_framework(void) + { ++ return true; /* nixpkgs darwin stdenv */ + #ifdef COMPILING_FOR_10_6 + NSRunningApplication* app = [NSRunningApplication currentApplication]; + NSApplicationActivationPolicy activationPolicy = [app activationPolicy]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 995b1459f045..6eadbcb5b650 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -37,14 +37,13 @@ buildPythonPackage rec { patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin-stdenv.patch ]; - patchPhase = '' + prePatch = '' # Failing test: ERROR: matplotlib.tests.test_style.test_use_url sed -i 's/test_use_url/fails/' lib/matplotlib/tests/test_style.py # Failing test: ERROR: test suite for <class 'matplotlib.sphinxext.tests.test_tinypages.TestTinyPages'> sed -i 's/TestTinyPages/fails/' lib/matplotlib/sphinxext/tests/test_tinypages.py ''; - meta = with stdenv.lib; { description = "python plotting library, making publication quality plots"; homepage = "http://matplotlib.sourceforge.net/"; |