treewide: remove old patches for macOS
These shouldn’t be needed now that we are on macOS 10.12.
This commit is contained in:
@@ -60,7 +60,7 @@ buildPythonPackage rec {
|
||||
url = "https://github.com/matplotlib/matplotlib/commit/2980184d092382a40ab21f95b79582ffae6e19d6.patch";
|
||||
sha256 = "1c0wj28zy8s5h6qiavx9zzbhlmhjwpzbc3fyyw9039mbnqk0spg2";
|
||||
})
|
||||
] ++ stdenv.lib.optionals stdenv.isDarwin [ ./darwin-stdenv-2.2.3.patch ];
|
||||
];
|
||||
|
||||
# Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the
|
||||
# corresponding interpreter object for its library paths. This fails if
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
--- 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 @@
|
||||
|
||||
static bool verify_framework(void)
|
||||
{
|
||||
+ return true; /* nixpkgs darwin stdenv */
|
||||
#ifdef COMPILING_FOR_10_6
|
||||
NSRunningApplication* app = [NSRunningApplication currentApplication];
|
||||
NSApplicationActivationPolicy activationPolicy = [app activationPolicy];
|
||||
@@ -1,12 +0,0 @@
|
||||
diff -ruN matplotlib-3.0.0/src/_macosx.m matplotlib-3.0.0.patched/src/_macosx.m
|
||||
--- matplotlib-3.0.0/src/_macosx.m 2018-09-16 00:35:21.000000000 +0200
|
||||
+++ matplotlib-3.0.0.patched/src/_macosx.m 2018-11-03 13:14:33.000000000 +0100
|
||||
@@ -2577,6 +2577,7 @@
|
||||
|
||||
static bool verify_framework(void)
|
||||
{
|
||||
+ return true; /* nixpkgs darwin stdenv */
|
||||
ProcessSerialNumber psn;
|
||||
/* These methods are deprecated, but they don't require the app to
|
||||
have started */
|
||||
|
||||
@@ -52,8 +52,7 @@ buildPythonPackage rec {
|
||||
++ stdenv.lib.optionals enableQt [ pyqt4 ];
|
||||
|
||||
patches =
|
||||
[ ./basedirlist.patch ] ++
|
||||
stdenv.lib.optionals stdenv.isDarwin [ ./darwin-stdenv.patch ];
|
||||
[ ./basedirlist.patch ];
|
||||
|
||||
# Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the
|
||||
# corresponding interpreter object for its library paths. This fails if
|
||||
|
||||
Reference in New Issue
Block a user