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-13 21:08:01 +00:00
parent 9ea242c617
commit 2c4e1e975c
2 changed files with 2 additions and 34 deletions
+2 -6
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: