diff options
| author | Moritz Ulrich <moritz@tarn-vedra.de> | 2014-11-08 15:44:22 +0100 |
|---|---|---|
| committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2014-11-08 22:48:13 +0100 |
| commit | 9b4ba66ac3d1ac3dba325fcb1db45c8f7a57e103 (patch) | |
| tree | def51e89a1ccaa2e77da422b7356e33a1c6adaa5 | |
| parent | 96fd4950f23fd3e1f35fc99ac286b582e36d0b8d (diff) | |
Bump poppler to 0.28.1 & remove outdated patches.
| -rw-r--r-- | pkgs/development/libraries/poppler/default.nix | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index c29da1438f39..feb3750907f5 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -4,18 +4,8 @@ }: let - version = "0.26.5"; # even major numbers are stable - sha256 = "1vni6kqpcx4jy9q8mhhxphfjych76xxmgs3jyg8yacbl6gxfazfy"; - - 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" ]; + version = "0.28.1"; # even major numbers are stable + sha256 = "01pxjdbhvpxf00ncf8d9wxc8gkcqcxz59lwrpa151ah988inxkrc"; poppler_drv = nameSuff: merge: stdenv.mkDerivation (stdenv.lib.mergeAttrsByFuncDefaultsClean [ rec { @@ -64,7 +54,6 @@ let poppler_qt4 = poppler_drv "qt4" { propagatedBuildInputs = [ qt4 poppler_glib ]; - patches = qtcairo_patches; NIX_LDFLAGS = "-lpoppler"; postConfigure = '' mkdir -p "$out/lib/pkgconfig" |