diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-08-19 04:20:00 +0000 |
|---|---|---|
| committer | Mario Rodas <marsam@users.noreply.github.com> | 2023-08-19 04:20:00 +0000 |
| commit | a40945ad67992bf4399d5827a6cae464c85d499e (patch) | |
| tree | 1df983bd2456fe97de15dc74d3b53516549b518d /pkgs/applications/misc/mupdf | |
| parent | dbd393758ac301de5490ae3e3134f15da2b2611a (diff) | |
mupdf: 1.22.1 -> 1.23.0
Changelog: https://git.ghostscript.com/?p=mupdf.git;a=blob_plain;f=CHANGES;hb=1.23.0
Diffstat (limited to 'pkgs/applications/misc/mupdf')
| -rw-r--r-- | pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch | 26 | ||||
| -rw-r--r-- | pkgs/applications/misc/mupdf/default.nix | 4 |
2 files changed, 9 insertions, 21 deletions
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 index 26ed3aec9fb71..771ad05835283 100644 --- 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 @@ -1,25 +1,13 @@ -From b2935ed7e2962d73f3b493c38c0bb1e8659c0a60 Mon Sep 17 00:00:00 2001 -From: toonn <toonn@toonn.io> -Date: Tue, 8 Mar 2022 23:59:19 +0100 -Subject: [PATCH 1/2] Use command -v in favor of which +Use command -v in favor of which ---- - Makerules | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makerules b/Makerules -index 0fdaecb..6d52cca 100644 --- a/Makerules +++ b/Makerules -@@ -145,7 +145,7 @@ else ifeq ($(OS),MACOS) - LD = xcrun ld - RANLIB = xcrun ranlib - -- ifeq (, $(shell which pkg-config)) -+ ifeq (, $(shell command -v pkg-config)) +@@ -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) --- -2.17.2 (Apple Git-113) - diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 936fa6082205c..606649d5bb12d 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -53,12 +53,12 @@ let in stdenv.mkDerivation rec { - version = "1.22.1"; + version = "1.23.0"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "sha256-1i88DkVuu8QucfWkfw+M0SzsK/Co1yt541+jWmU4slo="; + sha256 = "sha256-3kFAaS5pMULDEeAwrBVuOO4XXXq2wb4QxcmuljhGFk4="; }; patches = [ ./0001-Use-command-v-in-favor-of-which.patch |