diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 39059905a02..76a45a0ecc8 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, cmake, libiconvOrEmpty, libintlOrEmpty , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg -, qt4Support ? false, qt4 ? null +, qt4Support ? false, qt4 ? null, qt5 }: let @@ -71,4 +71,13 @@ let ''; }; -in { inherit poppler_glib poppler_qt4; } // poppler_glib + poppler_qt5 = poppler_drv "qt5" { + propagatedBuildInputs = [ qt5 poppler_glib ]; + postConfigure = '' + mkdir -p "$out/lib/pkgconfig" + install -c -m 644 poppler-qt5.pc "$out/lib/pkgconfig" + cd qt5 + ''; + }; + +in { inherit poppler_glib poppler_qt4 poppler_qt5; } // poppler_glib diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f29eaefb0c..af9630b1458 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6856,6 +6856,7 @@ let poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; popplerQt4 = poppler.poppler_qt4; + popplerQt5 = poppler.poppler_qt5; popt = callPackage ../development/libraries/popt { };