MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

jfbview: update mupdf 1.8 -> 1.9

Browse source
This commit is contained in:
Rahul Gopinath 2016-06-11 23:32:33 -07:00
parent 82f2e72941
commit b8a525a8b6
2 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/os-specific/linux/jfbview/default.nix
View file

@ -31,6 +31,10 @@ stdenv.mkDerivation rec {
imlib2
];
patches = [
./mupdf-1.9.patch
];
configurePhase = ''
# Hack. Probing (`ldconfig -p`) fails with ‘cannot execute binary file’.
# Overriding `OPENJP2 =` later works, but makes build output misleading:

28
pkgs/os-specific/linux/jfbview/mupdf-1.9.patch Normal file
View file

@ -0,0 +1,28 @@
--- JFBView-0.5.2-src/Makefile 2016-06-11 23:27:54.969894750 -0700
+++ JFBView-0.5.2-src/Makefile 2016-06-11 23:24:45.181142832 -0700
@@ -134,13 +134,22 @@
.PHONY: detect_libopenjp2
detect_libopenjp2:
- $(eval OPENJP2 = $(shell ldconfig -p | grep -q libopenjp2 && echo 'openjp2' || echo 'openjpeg'))
+ $(eval OPENJP2 = $(shell echo libopenjp2 | grep -q libopenjp2 && echo 'openjp2' || echo 'openjpeg'))
@echo "OPENJP2 = $(OPENJP2)" >> $(CONFIG_MK)
# mupdf_version only depends on -lmupdf.
mupdf_version: mupdf_version.cpp
- $(CXX) $(CXXFLAGS) -o $@ $^ $(LDLIBS) -lmupdf
-
+ $(CXX) $(CXXFLAGS) -o $@ $^ $(LDLIBS) -lmupdf \
+ -lpthread \
+ -lform \
+ -lncurses \
+ -lfreetype \
+ -lharfbuzz \
+ -lz \
+ -ljbig2dec \
+ -ljpeg \
+ -lmujs \
+ -lopenjp2
endif