jfbview: remove mujs and no-longer-necessary patch

mujs is only required when older versions of mupdf are used, but
we have a more recent one in nixpkgs.
This commit is contained in:
Linus Heckemann 2017-11-09 10:30:08 +00:00
parent 9ea242c617
commit 2c4e1e975c
2 changed files with 2 additions and 34 deletions

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
, freetype, harfbuzz, jbig2dec, libjpeg, libX11, mujs, mupdf, ncurses, openjpeg
, freetype, harfbuzz, jbig2dec, libjpeg, libX11, mupdf, ncurses, openjpeg
, openssl
, imageSupport ? true, imlib2 ? null }:
@ -27,16 +27,12 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
buildInputs = [
freetype harfbuzz jbig2dec libjpeg libX11 mujs mupdf ncurses openjpeg
freetype harfbuzz jbig2dec libjpeg libX11 mupdf ncurses openjpeg
openssl
] ++ stdenv.lib.optionals imageSupport [
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:

View file

@ -1,28 +0,0 @@
--- 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