From 3f7abb4eaf794d913faec6c92939e677a0ac2dd3 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Sun, 4 Aug 2024 22:09:26 -0500
Subject: [PATCH] mupdf: 1.23.6 -> 1.24.8

---
 .../0001-Use-command-v-in-favor-of-which.patch      | 13 -------------
 pkgs/applications/misc/mupdf/default.nix            | 12 ++++++------
 2 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch

diff --git a/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch b/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch
deleted file mode 100644
index 771ad0583528..000000000000
--- a/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Use command -v in favor of which
-
---- a/Makerules
-+++ b/Makerules
-@@ -170,7 +170,7 @@
-   ifneq ($(ARCHFLAGS),)
-     $(warning "MacOS with ARCHFLAGS set. Assuming we are building for arm64, and setting HAVE_LIBCRYPTO to no.")
-     HAVE_LIBCRYPTO := no
--  else ifeq (, $(shell which pkg-config))
-+  else ifeq (, $(shell command -v pkg-config))
-     $(warning "No pkg-config found, install it for proper integration of libcrypto")
-   else
-     HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 0f2ec9f39f23..c8ca74c59ff1 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -60,16 +60,15 @@ let
 
 in
 stdenv.mkDerivation rec {
-  version = "1.23.6";
+  version = "1.24.8";
   pname = "mupdf";
 
   src = fetchurl {
     url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
-    sha256 = "sha256-rBHrhZ3UBEiOUVPNyWUbtDQeW6r007Pyfir8gvmq3Ck=";
+    sha256 = "sha256-pRjZvpds2yAG1FOC1/+xubjWS8P9PLc8picNdS+n9Eg=";
   };
 
-  patches = [ ./0001-Use-command-v-in-favor-of-which.patch
-              ./0002-Add-Darwin-deps.patch
+  patches = [ ./0002-Add-Darwin-deps.patch
               ./0003-Fix-cpp-build.patch
             ];
 
@@ -166,20 +165,21 @@ stdenv.mkDerivation rec {
     EOF
 
     moveToOutput "bin" "$bin"
+    cp ./build/shared-release/libmupdf.so* $out/lib
   '' + (lib.optionalString (stdenv.isDarwin) ''
     for exe in $bin/bin/*; do
       install_name_tool -change build/shared-release/libmupdf.dylib $out/lib/libmupdf.dylib "$exe"
     done
   '') + (lib.optionalString (enableX11 || enableGL) ''
     mkdir -p $bin/share/icons/hicolor/48x48/apps
-    cp docs/logo/mupdf.png $bin/share/icons/hicolor/48x48/apps
+    cp docs/logo/mupdf-icon-48.png $bin/share/icons/hicolor/48x48/apps
   '') + (if enableGL then ''
     ln -s "$bin/bin/mupdf-gl" "$bin/bin/mupdf"
   '' else lib.optionalString (enableX11) ''
     ln -s "$bin/bin/mupdf-x11" "$bin/bin/mupdf"
   '') + (lib.optionalString (enableCxx) ''
     cp platform/c++/include/mupdf/*.h $out/include/mupdf
-    cp build/*/libmupdfcpp.so $out/lib
+    cp build/*/libmupdfcpp.so* $out/lib
   '') + (lib.optionalString (enablePython) (''
     mkdir -p $out/${python3.sitePackages}/mupdf
     cp build/*/_mupdf.so $out/${python3.sitePackages}