diff options
| -rw-r--r-- | pkgs/development/libraries/poppler/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 9c22430a711f..b15142dc6738 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg -, minimal ? false, qt4Support ? false, qt4 ? null, qt5Support ? false, qt5 ? null +, minimal ? false, qt4Support ? false, qt4 ? null, qt5Support ? false, qtbase ? null , utils ? false, suffix ? "glib" }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { [ zlib freetype fontconfig libjpeg lcms curl openjpeg ] ++ optional (!minimal) cairo ++ optional qt4Support qt4 - ++ optional qt5Support qt5.base; + ++ optional qt5Support qtbase; nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be9996e1d398..a73bda023df5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7819,10 +7819,7 @@ let suffix = "qt4"; }; - poppler_qt5 = poppler.override { - qt5Support = true; - suffix = "qt5"; - }; + poppler_qt5 = qt5Libs.popplerQt; poppler_utils = poppler.override { suffix = "utils"; utils = true; }; @@ -7911,6 +7908,12 @@ let withQt5 = true; }; + popplerQt = callPackage ../development/libraries/poppler { + lcms = lcms2; + qt5Support = true; + suffix = "qt5"; + }; + }; qt55Libs = lib.makeScope qt55.newScope qt5LibsFun; |