poppler: use openjpeg instead of unmaintained internal decoder

This commit is contained in:
Nikolay Amiantov 2016-08-18 12:46:38 +03:00
parent 447d88d415
commit d5e1f5bbaa

View File

@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
# TODO: reduce propagation to necessary libs # TODO: reduce propagation to necessary libs
propagatedBuildInputs = with lib; propagatedBuildInputs = with lib;
[ zlib freetype fontconfig libjpeg ] [ zlib freetype fontconfig libjpeg openjpeg ]
++ optionals (!minimal) [ cairo lcms curl openjpeg ] ++ optionals (!minimal) [ cairo lcms curl ]
++ optional qt4Support qt4 ++ optional qt4Support qt4
++ optional qt5Support qtbase; ++ optional qt5Support qtbase;
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
] ]
++ optionals minimal [ ++ optionals minimal [
"--disable-poppler-glib" "--disable-poppler-cpp" "--disable-poppler-glib" "--disable-poppler-cpp"
"--disable-libopenjpeg" "--disable-libcurl" "--disable-libcurl"
] ]
++ optional (!utils) "--disable-utils" ; ++ optional (!utils) "--disable-utils" ;