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 771ad05835283..0000000000000 --- 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 9422b6452cec2..61a5a6769a23b 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -60,18 +60,18 @@ let in stdenv.mkDerivation rec { - version = "1.23.6"; + version = "1.24.5"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "sha256-rBHrhZ3UBEiOUVPNyWUbtDQeW6r007Pyfir8gvmq3Ck="; + sha256 = "sha256-NNRXos6T6U77kgucTcGkD9ileOLXQSTVUQpZzv6dO6M="; }; - patches = [ ./0001-Use-command-v-in-favor-of-which.patch - ./0002-Add-Darwin-deps.patch - ./0003-Fix-cpp-build.patch - ]; + patches = [ + ./0002-Add-Darwin-deps.patch + ./0003-Fix-cpp-build.patch + ]; postPatch = '' substituteInPlace Makerules --replace "(shell pkg-config" "(shell $PKG_CONFIG" @@ -165,14 +165,17 @@ stdenv.mkDerivation rec { Cflags: -I\''${includedir} EOF + ln -s $out/lib/libmupdf.so.24.5 $out/lib/libmupdf.so moveToOutput "bin" "$bin" '' + (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 + for i in 16 24 32 48 72 128 256 512; do + install -D docs/logo/mupdf-icon-''${i}.png $bin/share/icons/hicolor/''${i}x''${i}/apps/mupdf.png + done + install -D docs/logo/mupdf-icon.svg $bin/share/icons/hicolor/scalable/apps/mupdf.svg '') + (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 b7eff35913c3b..aa0ab168c099b 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 = [