From d5e1f5bbaa911432b20131d62afbe52ab7309402 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 18 Aug 2016 12:46:38 +0300 Subject: [PATCH] poppler: use openjpeg instead of unmaintained internal decoder --- pkgs/development/libraries/poppler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 9a15c87bf7d5..9e8817c6ea7f 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { # TODO: reduce propagation to necessary libs propagatedBuildInputs = with lib; - [ zlib freetype fontconfig libjpeg ] - ++ optionals (!minimal) [ cairo lcms curl openjpeg ] + [ zlib freetype fontconfig libjpeg openjpeg ] + ++ optionals (!minimal) [ cairo lcms curl ] ++ optional qt4Support qt4 ++ optional qt5Support qtbase; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ] ++ optionals minimal [ "--disable-poppler-glib" "--disable-poppler-cpp" - "--disable-libopenjpeg" "--disable-libcurl" + "--disable-libcurl" ] ++ optional (!utils) "--disable-utils" ;