k2pdfopt: fix mupdf linking

+18 -6
+15 -3
pkgs/applications/misc/k2pdfopt/default.nix
··· 2 2 , zlib, libpng 3 3 , enableGSL ? true, gsl 4 4 , enableGhostScript ? true, ghostscript 5 - , enableMuPDF ? true, jbig2dec, openjpeg, freetype, harfbuzz, mupdf 5 + , enableMuPDF ? true, mupdf 6 6 , enableJPEG2K ? true, jasper 7 7 , enableDJVU ? true, djvulibre 8 8 , enableGOCR ? false, gocr # Disabled by default due to crashes ··· 51 51 url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2c4e5867ee699b1081527bc6c6ea0e99a35a5c27"; 52 52 sha256 = "14k7x47ifx82sds1c06ibzbmcparfg80719jhgwjk6w1vkh4r693"; 53 53 }) 54 + 55 + (fetchpatch { 56 + name = "mupdf-1.10a-shared_libs-1.patch"; 57 + url = "http://www.linuxfromscratch.org/patches/downloads/mupdf/mupdf-1.10a-shared_libs-1.patch"; 58 + sha256 = "0kg4vahp7hlyyj5hl18brk8s8xcbqrx19pqjzkfq6ha8mqa3k4ab"; 59 + }) 54 60 ]; 61 + 62 + # Override this since the jpeg directory was renamed libjpeg in mupdf 1.11 63 + preConfigure = '' 64 + # Don't remove mujs because upstream version is incompatible 65 + rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib} 66 + ''; 55 67 }); 56 68 leptonica_modded = leptonica.overrideAttrs (attrs: { 57 69 prePatch = '' ··· 75 87 [ zlib libpng ] ++ 76 88 optional enableGSL gsl ++ 77 89 optional enableGhostScript ghostscript ++ 78 - optionals enableMuPDF [ jbig2dec openjpeg freetype harfbuzz mupdf_modded ] ++ 79 - optionals enableJPEG2K [ jasper ] ++ 90 + optional enableMuPDF mupdf_modded ++ 91 + optional enableJPEG2K jasper ++ 80 92 optional enableDJVU djvulibre ++ 81 93 optional enableGOCR gocr ++ 82 94 optionals enableTesseract [ leptonica_modded tesseract_modded ];
+3 -3
pkgs/applications/misc/k2pdfopt/k2pdfopt.patch
··· 17 17 -# willus.h 18 18 -# HAVE_GSL_LIB 19 19 +pkg_check_modules(GSL gsl) 20 - +if(MUPDF_FOUND) 20 + +if(GSL_FOUND) 21 21 + set(HAVE_GSL_LIB 1) 22 22 + include_directories(SYSTEM ${GSL_INCLUDEDIR}) 23 23 + set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GSL_LDFLAGS}) 24 - +endif(MUPDF_FOUND) 24 + +endif(GSL_FOUND) 25 25 26 26 27 27 # libfreetype6 (>= 2.3.9), libjbig2dec0, libjpeg8 (>= 8c), libx11-6, libxext6, zlib1g (>= 1:1.2.0) ··· 30 30 message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}") 31 31 set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS} 32 32 - -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype 33 - + -lopenjp2 -ljbig2dec -ljpeg -lfreetype -lharfbuzz 33 + + 34 34 ) 35 35 endif(MUPDF_FOUND) 36 36