diff options
| author | Linus Heckemann <git@sphalerite.org> | 2017-11-09 10:30:08 +0000 |
|---|---|---|
| committer | Linus Heckemann <git@sphalerite.org> | 2017-11-13 21:08:01 +0000 |
| commit | 2c4e1e975cacab72ceb8933ce640c4aeecee1e5a (patch) | |
| tree | 6482044e3b348f80d45b1921f9dcb342fad2b142 /pkgs/os-specific/linux/jfbview | |
| parent | 9ea242c617bf6fca9b425b5199a26294a406cbc0 (diff) | |
| download | nixpkgs-2c4e1e975cacab72ceb8933ce640c4aeecee1e5a.tar nixpkgs-2c4e1e975cacab72ceb8933ce640c4aeecee1e5a.tar.gz nixpkgs-2c4e1e975cacab72ceb8933ce640c4aeecee1e5a.tar.bz2 nixpkgs-2c4e1e975cacab72ceb8933ce640c4aeecee1e5a.tar.lz nixpkgs-2c4e1e975cacab72ceb8933ce640c4aeecee1e5a.tar.xz nixpkgs-2c4e1e975cacab72ceb8933ce640c4aeecee1e5a.tar.zst nixpkgs-2c4e1e975cacab72ceb8933ce640c4aeecee1e5a.zip | |
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.
Diffstat (limited to 'pkgs/os-specific/linux/jfbview')
| -rw-r--r-- | pkgs/os-specific/linux/jfbview/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/jfbview/mupdf-1.9.patch | 28 |
2 files changed, 2 insertions, 34 deletions
diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix index 310cdbd1eee..fab66a329e2 100644 --- a/pkgs/os-specific/linux/jfbview/default.nix +++ b/pkgs/os-specific/linux/jfbview/default.nix @@ -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: diff --git a/pkgs/os-specific/linux/jfbview/mupdf-1.9.patch b/pkgs/os-specific/linux/jfbview/mupdf-1.9.patch deleted file mode 100644 index 99d7377239b..00000000000 --- a/pkgs/os-specific/linux/jfbview/mupdf-1.9.patch +++ /dev/null @@ -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 - - |