pyrox.dev
Merge pull request #32207 from peterhoeg/u/cups
cups: 2.2.2 -> 2.2.6
authored by Orivej Desh and committed by GitHub d104321b a1e1e437
+1
-1
nixos/tests/printing.nix
+1
-1
nixos/tests/printing.nix
···
39
39
$client->waitForUnit("cups.service");
40
40
$client->sleep(10); # wait until cups is fully initialized
41
41
$client->succeed("lpstat -r") =~ /scheduler is running/ or die;
42
-
$client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die;
42
+
$client->succeed("lpstat -H") =~ "localhost:631" or die;
43
43
$client->succeed("curl --fail http://localhost:631/");
44
44
$client->succeed("curl --fail http://server:631/");
45
45
$server->fail("curl --fail --connect-timeout 2 http://client:631/");
+41
-26
pkgs/misc/cups/default.nix
+41
-26
pkgs/misc/cups/default.nix
···
1
-
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam
2
-
, dbus, systemd, acl, gmp, darwin
1
+
{ stdenv, fetchurl, fetchpatch, pkgconfig, removeReferencesTo
2
+
, zlib, libjpeg, libpng, libtiff, pam, dbus, systemd, acl, gmp, darwin
3
3
, libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
4
4
}:
5
5
···
9
9
with stdenv.lib;
10
10
stdenv.mkDerivation rec {
11
11
name = "cups-${version}";
12
-
version = "2.2.2";
12
+
version = "2.2.6";
13
13
14
14
passthru = { inherit version; };
15
15
16
16
src = fetchurl {
17
17
url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz";
18
-
sha256 = "1xp4ji4rz3xffsz6w6nd60ajxvvihn02pkyp2l4smhqxbmyvp2gm";
18
+
sha256 = "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20";
19
19
};
20
20
21
21
outputs = [ "out" "lib" "dev" "man" ];
22
22
23
-
nativeBuildInputs = [ pkgconfig ];
23
+
patches = [
24
+
(fetchpatch {
25
+
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/cups-systemd-socket.patch?h=packages/cups";
26
+
sha256 = "1ddgdlg9s0l2ph6l8lx1m1lx6k50gyxqi3qiwr44ppq1rxs80ny5";
27
+
})
28
+
];
29
+
30
+
nativeBuildInputs = [ pkgconfig removeReferencesTo ];
31
+
24
32
buildInputs = [ zlib libjpeg libpng libtiff libusb gnutls libpaper ]
25
33
++ optionals stdenv.isLinux [ avahi pam dbus systemd acl ]
26
34
++ optionals stdenv.isDarwin (with darwin; [
···
30
38
propagatedBuildInputs = [ gmp ];
31
39
32
40
configureFlags = [
33
-
# Put just lib/* and locale into $lib; this didn't work directly.
34
-
# lib/cups is moved back to $out in postInstall.
35
-
# Beware: some parts of cups probably don't fully respect these.
36
-
"--prefix=$(lib)"
37
-
"--datadir=$(out)/share"
38
-
"--localedir=$(lib)/share/locale"
39
-
40
41
"--localstatedir=/var"
41
42
"--sysconfdir=/etc"
42
-
"--with-systemd=\${out}/lib/systemd/system"
43
+
"--with-rundir=/run"
43
44
"--enable-raw-printing"
44
45
"--enable-threads"
45
46
] ++ optionals stdenv.isLinux [
···
49
50
++ optional (gnutls != null) "--enable-ssl"
50
51
++ optional (avahi != null) "--enable-avahi"
51
52
++ optional (libpaper != null) "--enable-libpaper"
52
-
++ optionals stdenv.isDarwin [
53
-
"--with-bundledir=$out"
54
-
"--disable-launchd"
55
-
];
53
+
++ optional stdenv.isDarwin "--disable-launchd";
54
+
55
+
preConfigure = ''
56
+
configureFlagsArray+=(
57
+
# Put just lib/* and locale into $lib; this didn't work directly.
58
+
# lib/cups is moved back to $out in postInstall.
59
+
# Beware: some parts of cups probably don't fully respect these.
60
+
"--prefix=$lib"
61
+
"--datadir=$out/share"
62
+
"--localedir=$lib/share/locale"
63
+
64
+
"--with-systemd=$out/lib/systemd/system"
56
65
57
-
# XXX: Hackery until https://github.com/NixOS/nixpkgs/issues/24693
58
-
preBuild = if stdenv.isDarwin then ''
59
-
export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks
60
-
'' else null;
66
+
${optionalString stdenv.isDarwin ''
67
+
"--with-bundledir=$out"
68
+
''}
69
+
)
70
+
'';
61
71
62
72
installFlags =
63
73
[ # Don't try to write in /var at build time.
···
80
90
enableParallelBuilding = true;
81
91
82
92
postInstall = ''
83
-
moveToOutput lib/cups "$out"
93
+
libexec=${if stdenv.isDarwin then "libexec/cups" else "lib/cups"}
94
+
moveToOutput $libexec "$out"
95
+
96
+
# $lib contains references to $out/share/cups.
97
+
# CUPS is working without them, so they are not vital.
98
+
find "$lib" -type f -exec grep -q "$out" {} \; \
99
+
-printf "removing references from %p\n" \
100
+
-exec remove-references-to -t "$out" {} +
84
101
85
102
# Delete obsolete stuff that conflicts with cups-filters.
86
103
rm -rf $out/share/cups/banners $out/share/cups/data/testprint
87
104
88
-
# Some outputs in cups-config were unexpanded and some even wrong.
89
105
moveToOutput bin/cups-config "$dev"
90
-
sed -e "/^cups_serverbin=/s|\$(lib)|$out|" \
91
-
-e "s|\$(out)|$out|" \
92
-
-e "s|\$(lib)|$lib|" \
106
+
sed -e "/^cups_serverbin=/s|$lib|$out|" \
93
107
-i "$dev/bin/cups-config"
94
108
95
109
# Rename systemd files provided by CUPS
96
110
for f in "$out"/lib/systemd/system/*; do
97
111
substituteInPlace "$f" \
112
+
--replace "$lib/$libexec" "$out/$libexec" \
98
113
--replace "org.cups.cupsd" "cups" \
99
114
--replace "org.cups." ""
100
115