darwin: matplotlib: update darwin patch for 1.5.0

This commit is contained in:
Asko Soukka 2015-11-01 14:55:06 +02:00
parent f933b48a53
commit 80fd9e96be
2 changed files with 10 additions and 12 deletions

View File

@ -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];

View File

@ -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/";