diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2018-07-28 19:25:14 +0200 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2018-07-28 19:25:14 +0200 |
| commit | f54b387b63299245092d9bbf09cb562bac125461 (patch) | |
| tree | 0c09809c0964d7bd931c6c8d1a7d19dcac342abd /pkgs/applications/misc/mupdf | |
| parent | 66d7126255b96a3d9c1cc0cdd7c2cd79d1789758 (diff) | |
| parent | 0fa2cbf59f7f68a8b9213a9cf9d2cd6dd2e518cc (diff) | |
| download | nixlib-f54b387b63299245092d9bbf09cb562bac125461.tar nixlib-f54b387b63299245092d9bbf09cb562bac125461.tar.gz nixlib-f54b387b63299245092d9bbf09cb562bac125461.tar.bz2 nixlib-f54b387b63299245092d9bbf09cb562bac125461.tar.lz nixlib-f54b387b63299245092d9bbf09cb562bac125461.tar.xz nixlib-f54b387b63299245092d9bbf09cb562bac125461.tar.zst nixlib-f54b387b63299245092d9bbf09cb562bac125461.zip | |
Merge remote-tracking branch 'central/master' into viric_clean
Diffstat (limited to 'pkgs/applications/misc/mupdf')
| -rw-r--r-- | pkgs/applications/misc/mupdf/darwin.patch | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/applications/misc/mupdf/darwin.patch b/pkgs/applications/misc/mupdf/darwin.patch index e0c7d6a7a676..7466fc2ca62b 100644 --- a/pkgs/applications/misc/mupdf/darwin.patch +++ b/pkgs/applications/misc/mupdf/darwin.patch @@ -21,7 +21,7 @@ diff --git a/Makerules b/Makerules -SYS_GLUT_CFLAGS := -SYS_GLUT_LIBS := -lglut -lGL - - ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes" + ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes" HAVE_LIBCRYPTO := yes SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto) @@ -113,7 +101,7 @@ SYS_CURL_CFLAGS += $(shell pkg-config --cflags openssl) @@ -33,3 +33,15 @@ diff --git a/Makerules b/Makerules ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes" HAVE_X11 := yes +diff --git a/platform/gl/gl-main.c b/platform/gl/gl-main.c +index d58f7ba..808af18 100644 +--- a/platform/gl/gl-main.c ++++ b/platform/gl/gl-main.c +@@ -16,6 +16,7 @@ void glutExit(void) {} + void glutMouseWheelFunc(void *fn) {} + void glutInitErrorFunc(void *fn) {} + void glutInitWarningFunc(void *fn) {} ++#define glutSetOption(X,Y) + #endif + + enum |