diff options
| author | Rahul Gopinath <rahul@gopinath.org> | 2016-06-11 23:32:33 -0700 |
|---|---|---|
| committer | Rahul Gopinath <rahul@gopinath.org> | 2016-06-12 09:48:34 -0700 |
| commit | b8a525a8b644d9fc9961ca3ab3c4083b93987b2c (patch) | |
| tree | f40a389b70d4c2e80da76cca2f6226d9f74438f3 /pkgs/os-specific/linux/jfbview | |
| parent | 82f2e72941764436242a4c4409bbd9675e957cfc (diff) | |
| download | nixpkgs-b8a525a8b644d9fc9961ca3ab3c4083b93987b2c.tar nixpkgs-b8a525a8b644d9fc9961ca3ab3c4083b93987b2c.tar.gz nixpkgs-b8a525a8b644d9fc9961ca3ab3c4083b93987b2c.tar.bz2 nixpkgs-b8a525a8b644d9fc9961ca3ab3c4083b93987b2c.tar.lz nixpkgs-b8a525a8b644d9fc9961ca3ab3c4083b93987b2c.tar.xz nixpkgs-b8a525a8b644d9fc9961ca3ab3c4083b93987b2c.tar.zst nixpkgs-b8a525a8b644d9fc9961ca3ab3c4083b93987b2c.zip | |
jfbview: update mupdf 1.8 -> 1.9
Diffstat (limited to 'pkgs/os-specific/linux/jfbview')
| -rw-r--r-- | pkgs/os-specific/linux/jfbview/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/jfbview/mupdf-1.9.patch | 28 |
2 files changed, 32 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix index 31ba5e1152c..bad64a20cac 100644 --- a/pkgs/os-specific/linux/jfbview/default.nix +++ b/pkgs/os-specific/linux/jfbview/default.nix @@ -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: diff --git a/pkgs/os-specific/linux/jfbview/mupdf-1.9.patch b/pkgs/os-specific/linux/jfbview/mupdf-1.9.patch new file mode 100644 index 00000000000..99d7377239b --- /dev/null +++ b/pkgs/os-specific/linux/jfbview/mupdf-1.9.patch @@ -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 + + |