public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

poppler: add Qt 5 version

Browse Source
This commit is contained in:
Thomas Tuegel 2015-01-19 11:12:04 -06:00
parent d927da8dae
commit 3319507b70
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/poppler/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake, libiconvOrEmpty, libintlOrEmpty { stdenv, fetchurl, fetchpatch, pkgconfig, cmake, libiconvOrEmpty, libintlOrEmpty
, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
, qt4Support ? false, qt4 ? null , qt4Support ? false, qt4 ? null, qt5
}: }:
let 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

1
pkgs/top-level/all-packages.nix
View File

@ -6856,6 +6856,7 @@ let
poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
popplerQt4 = poppler.poppler_qt4; popplerQt4 = poppler.poppler_qt4;
popplerQt5 = poppler.poppler_qt5;
popt = callPackage ../development/libraries/popt { }; popt = callPackage ../development/libraries/popt { };