From 0e44c983a42028aa46b7e4602ce26f71bda74d87 Mon Sep 17 00:00:00 2001 From: catvayor Date: Fri, 2 Aug 2024 10:49:38 +0200 Subject: [PATCH] zathura-mupdf 0.4.2 -> 0.4.3 --- pkgs/applications/misc/mupdf/default.nix | 10 ++++++---- pkgs/applications/misc/zathura/pdf-mupdf/default.nix | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 0f2ec9f39f23..c3beca98aecf 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -60,15 +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 + patches = [ ./0002-Add-Darwin-deps.patch ./0003-Fix-cpp-build.patch ]; @@ -165,6 +165,8 @@ stdenv.mkDerivation rec { Cflags: -I\''${includedir} EOF + cp $out/lib/libmupdf.so* $out/lib/libmupdf.so + moveToOutput "bin" "$bin" '' + (lib.optionalString (stdenv.isDarwin) '' for exe in $bin/bin/*; do @@ -172,7 +174,7 @@ stdenv.mkDerivation rec { 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) '' diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index b3b5d514a84c..7c59616e4ff3 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -21,12 +21,12 @@ }: stdenv.mkDerivation rec { - version = "0.4.2"; + version = "0.4.3"; pname = "zathura-pdf-mupdf"; src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - hash = "sha256-fFC+z9mJX9ccExsV336Ut+zJJa8UdfUz/qVp9YgcnhM="; + hash = "sha256-jM+E7gh+pyqOiLsvJanAELrqJhzrUsw/cyq60l93Z3Y="; }; nativeBuildInputs = [ -- 2.45.2