diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-12-03 13:49:33 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-12-03 13:50:30 +0100 |
| commit | 43c4d78bc6e19476c122efc82316122722e988aa (patch) | |
| tree | 98aeb86366fc77d1d3839fbecb11bb6d4986cb3f /pkgs | |
| parent | ea557c8fd18bd721f4e8017c0da2020e92c251e3 (diff) | |
| download | nixlib-43c4d78bc6e19476c122efc82316122722e988aa.tar nixlib-43c4d78bc6e19476c122efc82316122722e988aa.tar.gz nixlib-43c4d78bc6e19476c122efc82316122722e988aa.tar.bz2 nixlib-43c4d78bc6e19476c122efc82316122722e988aa.tar.lz nixlib-43c4d78bc6e19476c122efc82316122722e988aa.tar.xz nixlib-43c4d78bc6e19476c122efc82316122722e988aa.tar.zst nixlib-43c4d78bc6e19476c122efc82316122722e988aa.zip | |
popplerQt4: re-introduce the subpixel rendering patch
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/poppler/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index feb3750907f5..39059905a025 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, pkgconfig, cmake, libiconvOrEmpty, libintlOrEmpty +{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake, libiconvOrEmpty, libintlOrEmpty , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg , qt4Support ? false, qt4 ? null }: @@ -7,6 +7,14 @@ let version = "0.28.1"; # even major numbers are stable sha256 = "01pxjdbhvpxf00ncf8d9wxc8gkcqcxz59lwrpa151ah988inxkrc"; + # This is for Okular (and similar) to support subpixel rendering. + # It's kept from upstream because of political reasons. + qtcairo_patch = fetchpatch { + url = "https://github.com/giddie/poppler-qt4-cairo-backend/compare/" + + "fa1d636...b30f96c.diff"; # update to current maint...qt4-lcd + sha256 = "0g18y247k2vcz1n56rnfpy226f22v4r9c7pk8cf2h9l12vz2qxkm"; + }; + poppler_drv = nameSuff: merge: stdenv.mkDerivation (stdenv.lib.mergeAttrsByFuncDefaultsClean [ rec { name = "poppler-${nameSuff}-${version}"; @@ -53,6 +61,7 @@ let poppler_glib = poppler_drv "glib" { }; poppler_qt4 = poppler_drv "qt4" { + patches = [ qtcairo_patch ]; propagatedBuildInputs = [ qt4 poppler_glib ]; NIX_LDFLAGS = "-lpoppler"; postConfigure = '' |