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

Bump poppler to 0.28.1 & remove outdated patches.

Browse Source
This commit is contained in:
Moritz Ulrich 2014-11-08 15:44:22 +01:00
parent 96fd4950f2
commit 9b4ba66ac3
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,18 +4,8 @@
}: }:
let let
version = "0.26.5"; # even major numbers are stable version = "0.28.1"; # even major numbers are stable
sha256 = "1vni6kqpcx4jy9q8mhhxphfjych76xxmgs3jyg8yacbl6gxfazfy"; sha256 = "01pxjdbhvpxf00ncf8d9wxc8gkcqcxz59lwrpa151ah988inxkrc";
qtcairo_patches =
let qtcairo = fetchgit { # the version for poppler-0.24
url = "git://github.com/giddie/poppler-qt4-cairo-backend.git";
rev = "7b9e1ea763b579e635ee7614b10970b9635841cf";
sha256 = "0cdq0qw1sm6mxnrhmah4lfsd9wjlcdx86iyikwmjpwdmrkjk85r2";
}; in
[ "${qtcairo}/0001-Cairo-backend-added-to-Qt4-wrapper.patch"
"${qtcairo}/0002-Setting-default-Qt4-backend-to-Cairo.patch"
"${qtcairo}/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch" ];
poppler_drv = nameSuff: merge: stdenv.mkDerivation (stdenv.lib.mergeAttrsByFuncDefaultsClean [ poppler_drv = nameSuff: merge: stdenv.mkDerivation (stdenv.lib.mergeAttrsByFuncDefaultsClean [
rec { rec {
@ -64,7 +54,6 @@ let
poppler_qt4 = poppler_drv "qt4" { poppler_qt4 = poppler_drv "qt4" {
propagatedBuildInputs = [ qt4 poppler_glib ]; propagatedBuildInputs = [ qt4 poppler_glib ];
patches = qtcairo_patches;
NIX_LDFLAGS = "-lpoppler"; NIX_LDFLAGS = "-lpoppler";
postConfigure = '' postConfigure = ''
mkdir -p "$out/lib/pkgconfig" mkdir -p "$out/lib/pkgconfig"