diff options
author | Daniël de Kok <me@danieldk.eu> | 2018-11-02 09:20:05 +0100 |
---|---|---|
committer | Daniël de Kok <me@danieldk.eu> | 2018-11-02 10:20:09 +0100 |
commit | de6d025592be1ade67166817abf1e624d1c7e642 (patch) | |
tree | 26ee626e842ddd261c416d1c1d47b18abe3bf683 /pkgs/applications/misc/mupdf/default.nix | |
parent | 6753b2c6c1515411e3bf731b3c6a1413093a02e1 (diff) | |
download | nixpkgs-de6d025592be1ade67166817abf1e624d1c7e642.tar nixpkgs-de6d025592be1ade67166817abf1e624d1c7e642.tar.gz nixpkgs-de6d025592be1ade67166817abf1e624d1c7e642.tar.bz2 nixpkgs-de6d025592be1ade67166817abf1e624d1c7e642.tar.lz nixpkgs-de6d025592be1ade67166817abf1e624d1c7e642.tar.xz nixpkgs-de6d025592be1ade67166817abf1e624d1c7e642.tar.zst nixpkgs-de6d025592be1ade67166817abf1e624d1c7e642.zip |
mupdf: 1.13.0 -> 1.14.0
Changelog: https://mupdf.com/release_history.html
Diffstat (limited to 'pkgs/applications/misc/mupdf/default.nix')
-rw-r--r-- | pkgs/applications/misc/mupdf/default.nix | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index bce2a79cde3..d4f59272c9c 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg +{ stdenv, lib, fetchurl, pkgconfig, freetype, harfbuzz, openjpeg , jbig2dec, libjpeg , darwin , enableX11 ? true, libX11, libXext, libXi, libXrandr , enableCurl ? true, curl, openssl @@ -14,23 +14,17 @@ let in stdenv.mkDerivation rec { - version = "1.13.0"; + version = "1.14.0"; name = "mupdf-${version}"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${name}-source.tar.gz"; - sha256 = "02faww5bnjw76k6igrjzwf0lnw4xd9ckc8d6ilc3c4gfrdi6j707"; + sha256 = "093p7lv6pgyymagn28n58fs0np928r0i5p2az9cc4gwccwx4hhy4"; }; - patches = [ - (fetchpatch { - name = "CVE-2018-10289.patch"; - url = "https://bugs.ghostscript.com/attachment.cgi?id=15230"; - sha256 = "0jmpacxd9930g6k57kda9jrcrbk75whdlv8xwmqg5jwn848qvy4q"; - }) - ] + patches = # Use shared libraries to decrease size - ++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.13-shared_libs-1.patch + stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch ; @@ -38,7 +32,7 @@ in stdenv.mkDerivation rec { sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c ''; - makeFlags = [ "prefix=$(out)" ]; + makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ] ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] |