From 4c2316f556099ae37cc751801c2d3170962a2e86 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Mon, 6 Oct 2025 15:52:58 +0000
Subject: [PATCH 1/2] mupdf: fix build with enableCxx against Clang >= 20

---
 pkgs/by-name/mu/mupdf/package.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix
index 4536e8724de0..1d3b8cea5f99 100644
--- a/pkgs/by-name/mu/mupdf/package.nix
+++ b/pkgs/by-name/mu/mupdf/package.nix
@@ -3,6 +3,7 @@
   lib,
   fetchurl,
   fetchFromGitHub,
+  fetchpatch,
   copyDesktopItems,
   makeDesktopItem,
   desktopToDarwinBundle,
@@ -85,6 +86,19 @@ stdenv.mkDerivation rec {
     # Upstream C++ wrap script only defines fixed-sized integers on macOS but
     # this is required on aarch64-linux too.
     ./fix-cpp-build.patch
+  ]
+  # fix compatibility with Clang >= 20
+  ++ lib.optionals enableCxx [
+    (fetchpatch {
+      name = "scripts-wrap-parse.py-get_args-improve-caching-of-re.patch";
+      url = "https://github.com/ArtifexSoftware/mupdf/commit/559e45ac8c134712cd8eaee01536ea3841e3a449.patch";
+      hash = "sha256-gI3hzrNo6jj9eqQ9E/BJ3jxXi/sl1C5WRyYlkG3Gkfg=";
+    })
+    (fetchpatch {
+      name = "scripts-wrap-parse.py-get_args-fix-for-libclang-20.patch";
+      url = "https://github.com/ArtifexSoftware/mupdf/commit/4bbf411898341d3ba30f521a6c137a788793cd45.patch";
+      hash = "sha256-cxKNziAGjpDwEw/9ZQHslMeJbiqYo80899BDkUOIX8g=";
+    })
   ];
 
   postPatch = ''

From a6dae01d158ffadfcec8f1c35420ee8a83f56dc9 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Mon, 6 Oct 2025 15:52:58 +0000
Subject: [PATCH 2/2] python3Packages.pymupdf: disable test requiring network
 access

---
 pkgs/development/python-modules/pymupdf/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix
index ed5b711b247b..1ecf81796a86 100644
--- a/pkgs/development/python-modules/pymupdf/default.nix
+++ b/pkgs/development/python-modules/pymupdf/default.nix
@@ -122,6 +122,7 @@ buildPythonPackage rec {
     # Requires downloads
     "test_4457"
     "test_4445"
+    "test_4533"
     # Not a git repository, so git ls-files fails
     "test_open2"
   ];