pyrox.dev
mupdf: 1.22.1 -> 1.23.0
Changelog: https://git.ghostscript.com/?p=mupdf.git;a=blob_plain;f=CHANGES;hb=1.23.0
+7
-19
pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch
+7
-19
pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch
···
1
-
From b2935ed7e2962d73f3b493c38c0bb1e8659c0a60 Mon Sep 17 00:00:00 2001
2
-
From: toonn <toonn@toonn.io>
3
-
Date: Tue, 8 Mar 2022 23:59:19 +0100
4
-
Subject: [PATCH 1/2] Use command -v in favor of which
5
6
-
---
7
-
Makerules | 2 +-
8
-
1 file changed, 1 insertion(+), 1 deletion(-)
9
-
10
-
diff --git a/Makerules b/Makerules
11
-
index 0fdaecb..6d52cca 100644
12
--- a/Makerules
13
+++ b/Makerules
14
-
@@ -145,7 +145,7 @@ else ifeq ($(OS),MACOS)
15
-
LD = xcrun ld
16
-
RANLIB = xcrun ranlib
17
-
18
-
- ifeq (, $(shell which pkg-config))
19
-
+ ifeq (, $(shell command -v pkg-config))
20
$(warning "No pkg-config found, install it for proper integration of libcrypto")
21
else
22
HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
23
-
--
24
-
2.17.2 (Apple Git-113)
25
-
···
1
+
Use command -v in favor of which
2
3
--- a/Makerules
4
+++ b/Makerules
5
+
@@ -170,7 +170,7 @@
6
+
ifneq ($(ARCHFLAGS),)
7
+
$(warning "MacOS with ARCHFLAGS set. Assuming we are building for arm64, and setting HAVE_LIBCRYPTO to no.")
8
+
HAVE_LIBCRYPTO := no
9
+
- else ifeq (, $(shell which pkg-config))
10
+
+ else ifeq (, $(shell command -v pkg-config))
11
$(warning "No pkg-config found, install it for proper integration of libcrypto")
12
else
13
HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
+2
-2
pkgs/applications/misc/mupdf/default.nix
+2
-2
pkgs/applications/misc/mupdf/default.nix
···
53
54
in
55
stdenv.mkDerivation rec {
56
-
version = "1.22.1";
57
pname = "mupdf";
58
59
src = fetchurl {
60
url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
61
-
sha256 = "sha256-1i88DkVuu8QucfWkfw+M0SzsK/Co1yt541+jWmU4slo=";
62
};
63
64
patches = [ ./0001-Use-command-v-in-favor-of-which.patch
···
53
54
in
55
stdenv.mkDerivation rec {
56
+
version = "1.23.0";
57
pname = "mupdf";
58
59
src = fetchurl {
60
url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
61
+
sha256 = "sha256-3kFAaS5pMULDEeAwrBVuOO4XXXq2wb4QxcmuljhGFk4=";
62
};
63
64
patches = [ ./0001-Use-command-v-in-favor-of-which.patch