diff --git a/pkgs/applications/misc/mupdf/1.17/darwin.patch b/pkgs/applications/misc/mupdf/1.17/darwin.patch deleted file mode 100644 index be1b84b0012f..000000000000 --- a/pkgs/applications/misc/mupdf/1.17/darwin.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ruN mupdf-1.14.0-source.orig/Makerules mupdf-1.14.0-source/Makerules ---- mupdf-1.14.0-source.orig/Makerules 2018-11-02 06:57:12.114012496 +0100 -+++ mupdf-1.14.0-source/Makerules 2018-11-02 10:11:56.717232992 +0100 -@@ -80,13 +80,6 @@ - HAVE_GLUT := yes - SYS_GLUT_CFLAGS := -Wno-deprecated-declarations - SYS_GLUT_LIBS := -framework GLUT -framework OpenGL -- CC = xcrun cc -- AR = xcrun ar -- LD = xcrun ld -- RANLIB = xcrun ranlib -- --else ifeq ($(OS),Linux) -- HAVE_OBJCOPY := yes - - ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes) - SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) -@@ -119,12 +112,6 @@ - SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) - endif - -- HAVE_GLUT := yes -- ifeq ($(HAVE_GLUT),yes) -- SYS_GLUT_CFLAGS := -- SYS_GLUT_LIBS := -lglut -lGL -- endif -- - HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes) - ifeq ($(HAVE_X11),yes) - X11_CFLAGS := $(shell pkg-config --cflags x11 xext) diff --git a/pkgs/applications/misc/mupdf/1.17/default.nix b/pkgs/applications/misc/mupdf/1.17/default.nix deleted file mode 100644 index 932e23682f71..000000000000 --- a/pkgs/applications/misc/mupdf/1.17/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ stdenv, lib, fetchurl, pkg-config, freetype, harfbuzz, openjpeg -, jbig2dec, libjpeg , darwin -, enableX11 ? true, libX11, libXext, libXi, libXrandr -, enableCurl ? true, curl, openssl -, enableGL ? true, libglut, libGLU -}: - -let - - # OpenJPEG version is hardcoded in package source - openJpegVersion = with stdenv; - lib.versions.majorMinor (lib.getVersion openjpeg); - - -in stdenv.mkDerivation rec { - version = "1.17.0"; - pname = "mupdf"; - - src = fetchurl { - url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "13nl9nrcx2awz9l83mlv2psi1lmn3hdnfwxvwgwiwbxlkjl3zqq0"; - }; - - patches = - # Use shared libraries to decrease size - lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch - ++ lib.optional stdenv.isDarwin ./darwin.patch - ; - - postPatch = '' - sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c - ''; - - makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg libglut libGLU ] - ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] - ++ lib.optionals enableCurl [ curl openssl ] - ++ lib.optionals enableGL ( - if stdenv.isDarwin then - with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] - else - [ libglut libGLU ]) - ; - outputs = [ "bin" "dev" "out" "man" "doc" ]; - - preConfigure = '' - # Don't remove mujs because upstream version is incompatible - rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib} - ''; - - postInstall = '' - mkdir -p "$out/lib/pkgconfig" - cat >"$out/lib/pkgconfig/mupdf.pc" < $bin/share/applications/mupdf.desktop <