pyrox.dev
cups_filters: 1.0.71 -> 1.5.0
Also wrap filters adding necessary utils to PATH and enable parallel building.
+18
-17
pkgs/misc/cups/filters.nix
+18
-17
pkgs/misc/cups/filters.nix
···
1
-
{ stdenv, fetchurl, fetchpatch, pkgconfig, cups, poppler, poppler_utils, fontconfig
2
-
, libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash, avahi }:
3
4
-
stdenv.mkDerivation rec {
5
name = "cups-filters-${version}";
6
-
version = "1.0.71";
7
8
src = fetchurl {
9
url = "http://openprinting.org/download/cups-filters/${name}.tar.xz";
10
-
sha256 = "07wwlqcykfjfqcwj1bxk60ggahyaw7wcx32n5s104d1qkhham01i";
11
};
12
13
-
patches = [
14
-
./longer-shell-path.patch
15
-
(fetchpatch { # drop on update
16
-
name = "poppler-0.34.patch";
17
-
url = "https://bugs.linuxfoundation.org/attachment.cgi?id=493";
18
-
sha256 = "18za83q0b0n4hpvvw76jsv0hm89zmijvps2z5kg1srickqlxj891";
19
-
})
20
-
];
21
22
buildInputs = [
23
-
pkgconfig cups poppler poppler_utils fontconfig libjpeg libpng perl
24
ijs qpdf dbus avahi
25
];
26
···
29
"--enable-imagefilters"
30
"--with-rcdir=no"
31
"--with-shell=${stdenv.shell}"
32
];
33
34
-
makeFlags = "CUPS_SERVERBIN=$(out)/lib/cups CUPS_DATADIR=$(out)/share/cups CUPS_SERVERROOT=$(out)/etc/cups";
35
36
postConfigure =
37
''
···
46
47
postInstall =
48
''
49
-
for i in $out/lib/cups/filter/{pstopdf,texttops,imagetops}; do
50
-
substituteInPlace $i --replace 'which ' 'type -p '
51
done
52
'';
53
54
meta = {
55
homepage = http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters;
···
1
+
{ stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig
2
+
, libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash, avahi
3
+
, makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which
4
+
}:
5
6
+
let
7
+
binPath = stdenv.lib.makeSearchPath "bin" [ coreutils gnused bc gawk gnugrep which ];
8
+
9
+
in stdenv.mkDerivation rec {
10
name = "cups-filters-${version}";
11
+
version = "1.5.0";
12
13
src = fetchurl {
14
url = "http://openprinting.org/download/cups-filters/${name}.tar.xz";
15
+
sha256 = "0cjrh4wpdhkvmahfkg8f2a2qzilcq12i78q5arwr7dnmx1j8hapj";
16
};
17
18
+
nativeBuildInputs = [ pkgconfig makeWrapper ];
19
20
buildInputs = [
21
+
cups poppler poppler_utils fontconfig libjpeg libpng perl
22
ijs qpdf dbus avahi
23
];
24
···
27
"--enable-imagefilters"
28
"--with-rcdir=no"
29
"--with-shell=${stdenv.shell}"
30
+
"--with-test-font-path=/path-does-not-exist"
31
];
32
33
+
makeFlags = [ "CUPS_SERVERBIN=$(out)/lib/cups" "CUPS_DATADIR=$(out)/share/cups" "CUPS_SERVERROOT=$(out)/etc/cups" ];
34
35
postConfigure =
36
''
···
45
46
postInstall =
47
''
48
+
for i in $out/lib/cups/filter/*; do
49
+
wrapProgram "$i" --prefix PATH ':' ${binPath}
50
done
51
'';
52
+
53
+
enableParallelBuilding = true;
54
55
meta = {
56
homepage = http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters;
-13
pkgs/misc/cups/longer-shell-path.patch
-13
pkgs/misc/cups/longer-shell-path.patch
···
1
-
diff --git a/filter/foomatic-rip/foomaticrip.c b/filter/foomatic-rip/foomaticrip.c
2
-
index 90a851c..689a2bd 100644
3
-
--- a/filter/foomatic-rip/foomaticrip.c
4
-
+++ b/filter/foomatic-rip/foomaticrip.c
5
-
@@ -174,7 +174,7 @@ char cupsfilterpath[PATH_MAX] = "/usr/local/lib/cups/filter:"
6
-
"/opt/cups/filter:"
7
-
"/usr/lib/cups/filter";
8
-
9
-
-char modern_shell[64] = SHELL;
10
-
+char modern_shell[] = SHELL;
11
-
12
-
void config_set_option(const char *key, const char *value)
13
-
{
···