diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-04-02 06:58:09 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-04-02 06:58:09 -0500 |
| commit | 01e9dfb44988ca0d205582e914c4249abb4253de (patch) | |
| tree | 00818263efb21c5f2cecafdc506130bc2236169a /pkgs/misc/cups/filters.nix | |
| parent | 8769f43aa44d972b31f8f0e805262ff385d10e04 (diff) | |
| download | nixlib-01e9dfb44988ca0d205582e914c4249abb4253de.tar nixlib-01e9dfb44988ca0d205582e914c4249abb4253de.tar.gz nixlib-01e9dfb44988ca0d205582e914c4249abb4253de.tar.bz2 nixlib-01e9dfb44988ca0d205582e914c4249abb4253de.tar.lz nixlib-01e9dfb44988ca0d205582e914c4249abb4253de.tar.xz nixlib-01e9dfb44988ca0d205582e914c4249abb4253de.tar.zst nixlib-01e9dfb44988ca0d205582e914c4249abb4253de.zip | |
cups-filters: fix build with latest poppler
Diffstat (limited to 'pkgs/misc/cups/filters.nix')
| -rw-r--r-- | pkgs/misc/cups/filters.nix | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 524662a0ee6c..099bf9f6d0c0 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -10,6 +10,20 @@ stdenv.mkDerivation rec { sha256 = "1bq48nnrarlbf6qc93bz1n5wlh6j420gppbck3r45sinwhz5wa7m"; }; + patches = [ + (substituteAll { + src = ./longer-shell-path.patch; + bash = "${bash}/bin/bash"; + }) + + # Fix build with poppler-0.31.0 + (fetchurl { + url = "https://bugs.linuxfoundation.org/attachment.cgi?id=476"; + name = "cups-filters-poppler-0.31.0.patch"; + sha256 = "016pzksz4nl1sv3p5ahlnbmb7c899yrvlzq8jxic0gvdrzwd5bl4"; + }) + ]; + buildInputs = [ pkgconfig cups poppler fontconfig libjpeg libpng perl ijs qpdf dbus @@ -34,13 +48,6 @@ stdenv.mkDerivation rec { substituteInPlace filter/gstoraster.c --replace execve execvpe ''; - patches = [ - (substituteAll { - src = ./longer-shell-path.patch; - bash = "${bash}/bin/bash"; - }) - ]; - postInstall = '' for i in $out/lib/cups/filter/{pstopdf,texttops,imagetops}; do |