tangled
alpha
login
or
join now
tjh.dev
/
nixpkgs
0
fork
atom
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
0
fork
atom
overview
issues
pulls
pipelines
system-config-printer: 1.3.12 -> 1 5.7
Nikolay Amiantov
10 years ago
03353ce6
47017474
+38
-6
2 changed files
expand all
collapse all
unified
split
pkgs
tools
misc
system-config-printer
default.nix
detect_serverbindir.patch
+21
-6
pkgs/tools/misc/system-config-printer/default.nix
reviewed
···
5
5
, withGUI ? true
6
6
}:
7
7
8
8
-
stdenv.mkDerivation rec {
9
9
-
name = "system-config-printer-1.3.12";
8
8
+
let majorVersion = "1.5";
9
9
+
10
10
+
in stdenv.mkDerivation rec {
11
11
+
name = "system-config-printer-${majorVersion}.7";
10
12
11
13
src = fetchurl {
12
12
-
url = "http://cyberelk.net/tim/data/system-config-printer/1.3/${name}.tar.xz";
14
14
+
url = "http://cyberelk.net/tim/data/system-config-printer/${majorVersion}/${name}.tar.xz";
13
15
sha256 = "1cg9n75rg5l9vr1925n2g771kga33imikyl0mf70lww2sfgvs18r";
14
16
};
15
17
16
18
propagatedBuildInputs = [ pythonPackages.pycurl ];
19
19
+
20
20
+
patches = [ ./detect_serverbindir.patch ];
17
21
18
22
buildInputs =
19
23
[ intltool pkgconfig glib udev libusb1 cups xmlto
···
36
32
37
33
postInstall =
38
34
''
35
35
+
export makeWrapperArgs="--set prefix $out"
39
36
wrapPythonPrograms
37
37
+
# The program imports itself, so we need to move shell wrappers to a proper place.
38
38
+
fixupWrapper() {
39
39
+
mv "$out/share/system-config-printer/$2.py" \
40
40
+
"$out/bin/$1"
41
41
+
sed -i "s/.$2.py-wrapped/$2.py/g" "$out/bin/$1"
42
42
+
mv "$out/share/system-config-printer/.$2.py-wrapped" \
43
43
+
"$out/share/system-config-printer/$2.py"
44
44
+
}
45
45
+
fixupWrapper scp-dbus-service scp-dbus-service
46
46
+
fixupWrapper system-config-printer system-config-printer
47
47
+
fixupWrapper system-config-printer-applet applet
48
48
+
# This __init__.py is both executed and imported.
40
49
( cd $out/share/system-config-printer/troubleshoot
41
50
mv .__init__.py-wrapped __init__.py
42
51
)
43
43
-
44
44
-
# Upstream issue: https://github.com/twaugh/system-config-printer/issues/28
45
45
-
sed -i -e "s|/usr/bin|$out/bin|" "$out/share/dbus-1/services/org.fedoraproject.Config.Printing.service"
46
52
'';
47
53
48
54
meta = {
49
55
homepage = http://cyberelk.net/tim/software/system-config-printer/;
50
56
platforms = stdenv.lib.platforms.linux;
57
57
+
license = stdenv.lib.licenses.gpl2;
51
58
};
52
59
}
+17
pkgs/tools/misc/system-config-printer/detect_serverbindir.patch
reviewed
···
1
1
+
diff --git a/cupshelpers/config.py.in b/cupshelpers/config.py.in
2
2
+
index 55abbfc..1244327 100644
3
3
+
--- a/cupshelpers/config.py.in
4
4
+
+++ b/cupshelpers/config.py.in
5
5
+
@@ -22,3 +22,12 @@
6
6
+
prefix="@prefix@"
7
7
+
sysconfdir="@sysconfdir@"
8
8
+
cupsserverbindir="@cupsserverbindir@"
9
9
+
+
10
10
+
+try:
11
11
+
+ with open("/etc/cups/cups-files.conf") as config:
12
12
+
+ for cfgline in config:
13
13
+
+ args = cfgline.split(" ")
14
14
+
+ if len(args) == 2 and args[0] == "ServerBin":
15
15
+
+ cupsserverbindir = args[1].strip()
16
16
+
+except OSError:
17
17
+
+ pass