k2pdfopt: fix mupdf linking

pkgs/applications/misc/k2pdfopt/default.nix

@@ -2,7 +2,7 @@
 , zlib, libpng
 , enableGSL ? true, gsl
 , enableGhostScript ? true, ghostscript
-, enableMuPDF ? true, jbig2dec, openjpeg, freetype, harfbuzz, mupdf
+, enableMuPDF ? true, mupdf
 , enableJPEG2K ? true, jasper
 , enableDJVU ? true, djvulibre
 , enableGOCR ? false, gocr # Disabled by default due to crashes
@@ -51,7 +51,19 @@ stdenv.mkDerivation rec {
          url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2c4e5867ee699b1081527bc6c6ea0e99a35a5c27";
          sha256 = "14k7x47ifx82sds1c06ibzbmcparfg80719jhgwjk6w1vkh4r693";
         })
+
+        (fetchpatch {
+          name = "mupdf-1.10a-shared_libs-1.patch";
+          url = "http://www.linuxfromscratch.org/patches/downloads/mupdf/mupdf-1.10a-shared_libs-1.patch";
+          sha256 = "0kg4vahp7hlyyj5hl18brk8s8xcbqrx19pqjzkfq6ha8mqa3k4ab";
+        })
       ];
+
+      # Override this since the jpeg directory was renamed libjpeg in mupdf 1.11
+      preConfigure = ''
+        # Don't remove mujs because upstream version is incompatible
+        rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib}
+      '';
     });
     leptonica_modded = leptonica.overrideAttrs (attrs: {
       prePatch = ''
@@ -75,8 +87,8 @@ stdenv.mkDerivation rec {
     [ zlib libpng ] ++
     optional enableGSL gsl ++
     optional enableGhostScript ghostscript ++
-    optionals enableMuPDF [ jbig2dec openjpeg freetype harfbuzz mupdf_modded ] ++
-    optionals enableJPEG2K [ jasper ] ++
+    optional enableMuPDF mupdf_modded ++
+    optional enableJPEG2K jasper ++
     optional enableDJVU djvulibre ++
     optional enableGOCR gocr ++
     optionals enableTesseract [ leptonica_modded tesseract_modded ];

pkgs/applications/misc/k2pdfopt/k2pdfopt.patch

@@ -17,11 +17,11 @@ index 4a2378b..502c477 100644
 -# willus.h
 -# HAVE_GSL_LIB
 +pkg_check_modules(GSL gsl)
-+if(MUPDF_FOUND)
++if(GSL_FOUND)
 +  set(HAVE_GSL_LIB 1)
 +  include_directories(SYSTEM ${GSL_INCLUDEDIR})
 +  set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GSL_LDFLAGS})
-+endif(MUPDF_FOUND)
++endif(GSL_FOUND)
  
  
  # libfreetype6 (>= 2.3.9), libjbig2dec0, libjpeg8 (>= 8c), libx11-6, libxext6, zlib1g (>= 1:1.2.0)
@@ -30,7 +30,7 @@ index 4a2378b..502c477 100644
    message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}")
    set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS} 
 -    -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype
-+    -lopenjp2 -ljbig2dec -ljpeg -lfreetype -lharfbuzz
++ 
    )
  endif(MUPDF_FOUND)