diff options
| author | Rahul Gopinath <rahul@gopinath.org> | 2016-06-11 21:59:15 -0700 |
|---|---|---|
| committer | Rahul Gopinath <rahul@gopinath.org> | 2016-06-12 09:48:34 -0700 |
| commit | 82f2e72941764436242a4c4409bbd9675e957cfc (patch) | |
| tree | 9febe1f79ff1094c985337a7c9b238845e7b2e67 /pkgs | |
| parent | 9b385535e86cc56458fde630bba6903e3bfc2f80 (diff) | |
| download | nixpkgs-82f2e72941764436242a4c4409bbd9675e957cfc.tar nixpkgs-82f2e72941764436242a4c4409bbd9675e957cfc.tar.gz nixpkgs-82f2e72941764436242a4c4409bbd9675e957cfc.tar.bz2 nixpkgs-82f2e72941764436242a4c4409bbd9675e957cfc.tar.lz nixpkgs-82f2e72941764436242a4c4409bbd9675e957cfc.tar.xz nixpkgs-82f2e72941764436242a4c4409bbd9675e957cfc.tar.zst nixpkgs-82f2e72941764436242a4c4409bbd9675e957cfc.zip | |
zathura: Update mupdf dependency
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/zathura/pdf-mupdf/config.patch | 17 | ||||
| -rw-r--r-- | pkgs/applications/misc/zathura/pdf-mupdf/default.nix | 12 |
2 files changed, 7 insertions, 22 deletions
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/config.patch b/pkgs/applications/misc/zathura/pdf-mupdf/config.patch deleted file mode 100644 index 6445fab2298..00000000000 --- a/pkgs/applications/misc/zathura/pdf-mupdf/config.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- zathura-pdf-mupdf-0.2.7/config.mk -+++ zathura-pdf-mupdf-0.2.7/config.mk -@@ -32,10 +32,11 @@ - OPENSSL_INC ?= $(shell pkg-config --cflags libcrypto) - OPENSSL_LIB ?= $(shell pkg-config --libs libcrypto) - --MUPDF_LIB ?= -lmupdf -lmujs -+MUPDF_INC ?= $(shell pkg-config --cflags mupdf) -+MUPDF_LIB ?= $(shell pkg-config --libs mupdf) - --INCS = ${GTK_INC} ${GIRARA_INC} ${OPENSSL_INC} ${ZATHURA_INC} --LIBS = ${GTK_LIB} ${GIRARA_LIB} ${MUPDF_LIB} ${OPENSSL_LIB} -ljbig2dec -lopenjp2 -ljpeg -+INCS = ${GTK_INC} ${GIRARA_INC} ${OPENSSL_INC} ${ZATHURA_INC} ${MUPDF_INC} -+LIBS = ${GTK_LIB} ${GIRARA_LIB} ${OPENSSL_LIB} ${MUPDF_LIB} -ljbig2dec -ljpeg - - # flags - CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS) diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 2b74fc21b8c..b8f75b7151f 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, zathura_core, gtk, girara, mupdf, openssl }: +{ stdenv, lib, fetchurl, pkgconfig, zathura_core, gtk, girara, mupdf, openssl, libjpeg, jbig2dec, openjpeg, fetchpatch}: stdenv.mkDerivation rec { version = "0.3.0"; @@ -9,13 +9,15 @@ stdenv.mkDerivation rec { sha256 = "1j3j3wbp49walb19f0966qsnlqbd26wnsjpcxfbf021dav8vk327"; }; - buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf ]; + buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg ]; makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; - patches = [ - ./config.patch - ]; + patches = [(fetchpatch { + name = "mupdf-1.9.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/mupdf-1.9.patch?h=packages/zathura-pdf-mupdf"; + sha256 = "185wgg0z4b0z5aybcnnyvbs50h43imn5xz3nqmya4rk4v5bwy49y"; + })]; meta = with lib; { homepage = http://pwmt.org/projects/zathura/; |