diff options
| author | Emily <vcs@emily.moe> | 2024-08-27 19:16:20 +0100 |
|---|---|---|
| committer | Emily <vcs@emily.moe> | 2024-08-27 19:19:19 +0100 |
| commit | 8888333686f3da12e2e65ea02512ae37667e8681 (patch) | |
| tree | 17045b99eede3a927d6313e964119524b20b25df /pkgs/development/python-modules/matplotlib | |
| parent | da2ee88ef42738b121228082a70d43321535e98c (diff) | |
python3Packages.matplotlib: remove upstreamed patch
Fixes the build on Darwin.
Fixes: 513074bb9b4d8f5c1f025300a9cbfaeba79efa92
Diffstat (limited to 'pkgs/development/python-modules/matplotlib')
| -rw-r--r-- | pkgs/development/python-modules/matplotlib/darwin-sandbox-crash.patch | 14 | ||||
| -rw-r--r-- | pkgs/development/python-modules/matplotlib/default.nix | 6 |
2 files changed, 0 insertions, 20 deletions
diff --git a/pkgs/development/python-modules/matplotlib/darwin-sandbox-crash.patch b/pkgs/development/python-modules/matplotlib/darwin-sandbox-crash.patch deleted file mode 100644 index 883f1edc8be0..000000000000 --- a/pkgs/development/python-modules/matplotlib/darwin-sandbox-crash.patch +++ /dev/null @@ -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"]] diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 9282fe02f30f..2bcf4d246c45 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -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 |