diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2018-07-22 19:17:02 -0400 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2018-07-23 06:14:11 +0000 |
| commit | d4d5f8ecede7374e49273d835c3a32ade26490e5 (patch) | |
| tree | a8d7906322a2bb272e68b165726357c16f67a0ee | |
| parent | 83be1d081b827340670522fcd20bcf3ea10f98bd (diff) | |
| download | nixlib-d4d5f8ecede7374e49273d835c3a32ade26490e5.tar nixlib-d4d5f8ecede7374e49273d835c3a32ade26490e5.tar.gz nixlib-d4d5f8ecede7374e49273d835c3a32ade26490e5.tar.bz2 nixlib-d4d5f8ecede7374e49273d835c3a32ade26490e5.tar.lz nixlib-d4d5f8ecede7374e49273d835c3a32ade26490e5.tar.xz nixlib-d4d5f8ecede7374e49273d835c3a32ade26490e5.tar.zst nixlib-d4d5f8ecede7374e49273d835c3a32ade26490e5.zip | |
mupdf: fix on darwin
| -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 |