python3Packages.matplotlib: remove upstreamed patch (#337762)
This commit is contained in:
@@ -1,14 +0,0 @@
|
||||
--- a/lib/matplotlib/font_manager.py
|
||||
+++ b/lib/matplotlib/font_manager.py
|
||||
@@ -266,8 +266,11 @@ def _get_fontconfig_fonts():
|
||||
@lru_cache
|
||||
def _get_macos_fonts():
|
||||
"""Cache and list the font paths known to ``system_profiler SPFontsDataType``."""
|
||||
- d, = plistlib.loads(
|
||||
- subprocess.check_output(["system_profiler", "-xml", "SPFontsDataType"]))
|
||||
+ try:
|
||||
+ d, = plistlib.loads(
|
||||
+ subprocess.check_output(["system_profiler", "-xml", "SPFontsDataType"]))
|
||||
+ except (OSError, subprocess.CalledProcessError, plistlib.InvalidFileException):
|
||||
+ return []
|
||||
return [Path(entry["path"]) for entry in d["_items"]]
|
||||
@@ -100,12 +100,6 @@ buildPythonPackage rec {
|
||||
hash = "sha256-3gaxm425XdM9DcF8kmx8nr7Z9XIHS2+sT2UGimgU0BA=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [
|
||||
# Don't crash when running in Darwin sandbox
|
||||
# Submitted upstream: https://github.com/matplotlib/matplotlib/pull/28498
|
||||
./darwin-sandbox-crash.patch
|
||||
];
|
||||
|
||||
env.XDG_RUNTIME_DIR = "/tmp";
|
||||
|
||||
# Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the
|
||||
|
||||
Reference in New Issue
Block a user