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

* Update Poppler to 0.16.7.

Browse Source 
svn path=/nixpkgs/branches/kde-4.7/; revision=27703
This commit is contained in:
Eelco Dolstra 2011-07-11 13:04:38 +00:00
parent 76ec0dd430
commit a7b9ef8f4b
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,18 +1,24 @@
{ fetchurl, stdenv, qt4Support ? false, qt4, cairo, freetype, fontconfig, zlib, { fetchurl, stdenv, cairo, freetype, fontconfig, zlib
libjpeg, pixman, curl, libpthreadstubs, libXau, libXdmcp, openjpeg, , libjpeg, pixman, curl, libpthreadstubs, libXau, libXdmcp, openjpeg
libxml2, pkgconfig, glib, gtk, cmake, lcms }: , libxml2, pkgconfig, cmake, lcms
, gtkSupport ? false, glib ? null, gtk ? null
, qt4Support ? false, qt4 ? null
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "poppler-0.14.5"; name = "poppler-0.16.7";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}${name}.tar.gz"; url = "${meta.homepage}${name}.tar.gz";
sha256 = "0k41cj0yp3l7854y1hlghn2cgqmqq6hw5iz8i84q0w0s9iy321f8"; sha256 = "1k9by922qkn9pkkf03jjxxqhp4s0gmsgs6c8f4m19m1l5npyid7s";
}; };
propagatedBuildInputs = [zlib glib cairo freetype fontconfig libjpeg gtk lcms propagatedBuildInputs =
pixman curl libpthreadstubs libXau libXdmcp openjpeg libxml2 stdenv.gcc.libc] [ zlib cairo freetype fontconfig libjpeg lcms pixman curl
++ (if qt4Support then [qt4] else []); libpthreadstubs libXau libXdmcp openjpeg libxml2 stdenv.gcc.libc
]
++ stdenv.lib.optionals gtkSupport [ glib gtk ]
++ stdenv.lib.optional qt4Support qt4;
buildInputs = [ pkgconfig cmake ]; buildInputs = [ pkgconfig cmake ];
@ -23,6 +29,8 @@ stdenv.mkDerivation rec {
#doCheck = !qt4Support; #doCheck = !qt4Support;
checkTarget = "test"; checkTarget = "test";
enableParallelBuilding = true;
meta = { meta = {
homepage = http://poppler.freedesktop.org/; homepage = http://poppler.freedesktop.org/;
description = "Poppler, a PDF rendering library"; description = "Poppler, a PDF rendering library";

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

@ -4123,11 +4123,12 @@ let
policykit = callPackage ../development/libraries/policykit { }; policykit = callPackage ../development/libraries/policykit { };
poppler = callPackage ../development/libraries/poppler { poppler = callPackage ../development/libraries/poppler {
gtkSupport = true;
qt4Support = false; qt4Support = false;
}; };
popplerQt4 = poppler.override { popplerQt4 = poppler.override {
inherit qt4; gtkSupport = false;
qt4Support = true; qt4Support = true;
}; };