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

cups_filters: 1.0.71 -> 1.5.0

Browse Source 
Also wrap filters adding necessary utils to PATH and enable parallel building.
This commit is contained in:
Nikolay Amiantov 2016-01-13 19:07:59 +03:00
parent a814e243b5
commit eaaf988d45
2 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/misc/cups/filters.nix
View File

@ -1,26 +1,24 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, cups, poppler, poppler_utils, fontconfig { stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig
, libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash, avahi }: , libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash, avahi
, makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which
}:
stdenv.mkDerivation rec { let
binPath = stdenv.lib.makeSearchPath "bin" [ coreutils gnused bc gawk gnugrep which ];
in stdenv.mkDerivation rec {
name = "cups-filters-${version}"; name = "cups-filters-${version}";
version = "1.0.71"; version = "1.5.0";
src = fetchurl { src = fetchurl {
url = "http://openprinting.org/download/cups-filters/${name}.tar.xz"; url = "http://openprinting.org/download/cups-filters/${name}.tar.xz";
sha256 = "07wwlqcykfjfqcwj1bxk60ggahyaw7wcx32n5s104d1qkhham01i"; sha256 = "0cjrh4wpdhkvmahfkg8f2a2qzilcq12i78q5arwr7dnmx1j8hapj";
}; };
patches = [ nativeBuildInputs = [ pkgconfig makeWrapper ];
./longer-shell-path.patch
(fetchpatch { # drop on update
name = "poppler-0.34.patch";
url = "https://bugs.linuxfoundation.org/attachment.cgi?id=493";
sha256 = "18za83q0b0n4hpvvw76jsv0hm89zmijvps2z5kg1srickqlxj891";
})
];
buildInputs = [ buildInputs = [
pkgconfig cups poppler poppler_utils fontconfig libjpeg libpng perl cups poppler poppler_utils fontconfig libjpeg libpng perl
ijs qpdf dbus avahi ijs qpdf dbus avahi
]; ];
@ -29,9 +27,10 @@ stdenv.mkDerivation rec {
"--enable-imagefilters" "--enable-imagefilters"
"--with-rcdir=no" "--with-rcdir=no"
"--with-shell=${stdenv.shell}" "--with-shell=${stdenv.shell}"
"--with-test-font-path=/path-does-not-exist"
]; ];
makeFlags = "CUPS_SERVERBIN=$(out)/lib/cups CUPS_DATADIR=$(out)/share/cups CUPS_SERVERROOT=$(out)/etc/cups"; makeFlags = [ "CUPS_SERVERBIN=$(out)/lib/cups" "CUPS_DATADIR=$(out)/share/cups" "CUPS_SERVERROOT=$(out)/etc/cups" ];
postConfigure = postConfigure =
'' ''
@ -46,11 +45,13 @@ stdenv.mkDerivation rec {
postInstall = postInstall =
'' ''
for i in $out/lib/cups/filter/{pstopdf,texttops,imagetops}; do for i in $out/lib/cups/filter/*; do
substituteInPlace $i --replace 'which ' 'type -p ' wrapProgram "$i" --prefix PATH ':' ${binPath}
done done
''; '';
enableParallelBuilding = true;
meta = { meta = {
homepage = http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters; homepage = http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters;
description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc"; description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc";

13
pkgs/misc/cups/longer-shell-path.patch
View File

@ -1,13 +0,0 @@
diff --git a/filter/foomatic-rip/foomaticrip.c b/filter/foomatic-rip/foomaticrip.c
index 90a851c..689a2bd 100644
--- a/filter/foomatic-rip/foomaticrip.c
+++ b/filter/foomatic-rip/foomaticrip.c
@@ -174,7 +174,7 @@ char cupsfilterpath[PATH_MAX] = "/usr/local/lib/cups/filter:"
"/opt/cups/filter:"
"/usr/lib/cups/filter";
-char modern_shell[64] = SHELL;
+char modern_shell[] = SHELL;
void config_set_option(const char *key, const char *value)
{