pyrox.dev
lol
foo2zjs: less hardcoded paths
svn path=/nixpkgs/trunk/; revision=26179
+9
-3
pkgs/misc/drivers/foo2zjs/default.nix
+9
-3
pkgs/misc/drivers/foo2zjs/default.nix
···
26
26
inherit (sourceInfo) name version;
27
27
inherit buildInputs;
28
28
29
-
phaseNames = ["fixMakefile" "doMakeDirs" "doMakeInstall" "deployGetWeb"];
29
+
phaseNames = ["doPatch" "fixHardcodedPaths" "doMakeDirs" "doMakeInstall" "deployGetWeb"];
30
+
31
+
patches = [ ./no-hardcode-fw.diff ];
32
+
30
33
makeFlags = [
31
34
''PREFIX=$out''
32
35
''UDEVBIN=$out/bin''
···
37
40
''FOODB=$out/share/foomatic/db/source''
38
41
''MODEL=$out/share/cups/model''
39
42
];
43
+
40
44
installFlags = [ "install-hotplug" ];
41
-
fixMakefile = a.fullDepEntry ''
45
+
46
+
fixHardcodedPaths = a.fullDepEntry ''
42
47
touch all-test
43
48
sed -e "/BASENAME=/iPATH=$out/bin:$PATH" -i *-wrapper *-wrapper.in
44
49
sed -e '/install-usermap/d' -i Makefile
45
50
sed -e "s@/etc/hotplug/usb@$out&@" -i *rules*
46
-
'' ["doUnpack" "minInit"];
51
+
sed -e "/PRINTERID=/s@=.*@=$out/bin/usb_printerid@" -i hplj1000
52
+
'' ["doPatch" "minInit"];
47
53
48
54
doMakeDirs = a.fullDepEntry ''
49
55
mkdir -pv $out/{etc/udev/rules.d,lib/udev/rules.d,etc/hotplug/usb}
+98
pkgs/misc/drivers/foo2zjs/no-hardcode-fw.diff
+98
pkgs/misc/drivers/foo2zjs/no-hardcode-fw.diff
···
1
+
#
2
+
#
3
+
# patch "hplj1000"
4
+
# from [d5336e74866d31735d97874191351a0dcc092b44]
5
+
# to [55102b37684ee5181674d19d866caec2cf603412]
6
+
#
7
+
============================================================
8
+
--- a/hplj1000 d5336e74866d31735d97874191351a0dcc092b44
9
+
+++ b/hplj1000 55102b37684ee5181674d19d866caec2cf603412
10
+
@@ -39,11 +39,6 @@ DEV=""
11
+
DEV=""
12
+
13
+
#
14
+
-# Directory to find downloadable HP firmware files sihpMMMM.dl
15
+
-#
16
+
-FWDIR=/usr/share/foo2zjs/firmware
17
+
-
18
+
-#
19
+
# Program used to determine USB printer id information
20
+
#
21
+
# NOTE: /usr/bin is NOT mounted at this point
22
+
@@ -83,57 +78,61 @@ case "$0" in
23
+
MODEL=P1005; FWMODEL=$MODEL
24
+
USB1=0x03f0 #Vendor
25
+
USB2=0x3d17 #Model
26
+
- FWDIR=/usr/share/foo2xqx/firmware
27
+
+ DRIVER=foo2xqx
28
+
;;
29
+
*P1006)
30
+
MODEL=P1006; FWMODEL=$MODEL
31
+
USB1=0x03f0 #Vendor
32
+
USB2=0x3e17 #Model
33
+
- FWDIR=/usr/share/foo2xqx/firmware
34
+
+ DRIVER=foo2xqx
35
+
;;
36
+
*P1007)
37
+
MODEL=P1007; FWMODEL=P1005 # Alias
38
+
USB1=0x03f0 #Vendor
39
+
USB2=0x4817 #Model
40
+
- FWDIR=/usr/share/foo2xqx/firmware
41
+
+ DRIVER=foo2xqx
42
+
;;
43
+
*P1008)
44
+
MODEL=P1008; FWMODEL=P1006 # Alias
45
+
USB1=0x03f0 #Vendor
46
+
USB2=0x4917 #Model
47
+
- FWDIR=/usr/share/foo2xqx/firmware
48
+
+ DRIVER=foo2xqx
49
+
;;
50
+
*P1505)
51
+
MODEL=P1505; FWMODEL=$MODEL
52
+
USB1=0x03f0 #Vendor
53
+
USB2=0x3f17 #Model
54
+
- FWDIR=/usr/share/foo2xqx/firmware
55
+
+ DRIVER=foo2xqx
56
+
;;
57
+
*P1505n)
58
+
MODEL=P1505n; FWMODEL=$MODEL
59
+
USB1=0x03f0 #Vendor
60
+
USB2=0x4017 #Model
61
+
- FWDIR=/usr/share/foo2xqx/firmware
62
+
+ DRIVER=foo2xqx
63
+
;;
64
+
*1000)
65
+
MODEL=1000; FWMODEL=$MODEL
66
+
USB1=0x03f0 #Vendor
67
+
USB2=0x0517 #Model
68
+
+ DRIVER=foo2zjs
69
+
;;
70
+
*1005)
71
+
MODEL=1005; FWMODEL=$MODEL
72
+
USB1=0x03f0 #Vendor
73
+
USB2=0x1317 #Model
74
+
+ DRIVER=foo2zjs
75
+
;;
76
+
*1018)
77
+
MODEL=1018; FWMODEL=$MODEL
78
+
USB1=0x03f0 #Vendor
79
+
USB2=0x4117 #Model
80
+
+ DRIVER=foo2zjs
81
+
;;
82
+
*1020)
83
+
MODEL=1020; FWMODEL=$MODEL
84
+
USB1=0x03f0 #Vendor
85
+
USB2=0x2b17 #Model
86
+
+ DRIVER=foo2zjs
87
+
;;
88
+
*)
89
+
log "Only HP LaserJet 100[05],1018,1020,P100[5678],P1505 are supported"
90
+
@@ -203,7 +202,7 @@ load1() {
91
+
#
92
+
load1() {
93
+
_dev="$1"
94
+
- fw="$FWDIR/sihp$FWMODEL.dl"
95
+
+ fw="${FOO2ZJS_DATADIR:-/usr/share}/$DRIVER/firmware/sihp$FWMODEL.dl"
96
+
if [ ! -f "$fw" ]; then
97
+
log "Missing HP LaserJet $MODEL firmware file $fw"
98
+
log "...read foo2zjs installation instructions and run ./getweb $MODEL"