Author: urkud
Date: Sun Mar 6 16:07:53 2011
New Revision: 26179
URL: https://svn.nixos.org/websvn/nix/?rev=26179&sc=1
Log:
foo2zjs: less hardcoded paths
Added:
nixpkgs/trunk/pkgs/misc/drivers/foo2zjs/no-hardcode-fw.diff
Modified:
nixpkgs/trunk/pkgs/misc/drivers/foo2zjs/default.nix
Modified: nixpkgs/trunk/pkgs/misc/drivers/foo2zjs/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/misc/drivers/foo2zjs/default.nix Sun Mar 6 16:07:47
2011 (r26178)
+++ nixpkgs/trunk/pkgs/misc/drivers/foo2zjs/default.nix Sun Mar 6 16:07:53
2011 (r26179)
@@ -26,7 +26,10 @@
inherit (sourceInfo) name version;
inherit buildInputs;
- phaseNames = ["fixMakefile" "doMakeDirs" "doMakeInstall" "deployGetWeb"];
+ phaseNames = ["doPatch" "fixHardcodedPaths" "doMakeDirs" "doMakeInstall"
"deployGetWeb"];
+
+ patches = [ ./no-hardcode-fw.diff ];
+
makeFlags = [
''PREFIX=$out''
''UDEVBIN=$out/bin''
@@ -37,13 +40,16 @@
''FOODB=$out/share/foomatic/db/source''
''MODEL=$out/share/cups/model''
];
+
installFlags = [ "install-hotplug" ];
- fixMakefile = a.fullDepEntry ''
+
+ fixHardcodedPaths = a.fullDepEntry ''
touch all-test
sed -e "/BASENAME=/iPATH=$out/bin:$PATH" -i *-wrapper *-wrapper.in
sed -e '/install-usermap/d' -i Makefile
sed -e "s@/etc/hotplug/usb@$out&@" -i *rules*
- '' ["doUnpack" "minInit"];
+ sed -e "/PRINTERID=/s@=.*@=$out/bin/usb_printerid@" -i hplj1000
+ '' ["doPatch" "minInit"];
doMakeDirs = a.fullDepEntry ''
mkdir -pv $out/{etc/udev/rules.d,lib/udev/rules.d,etc/hotplug/usb}
Added: nixpkgs/trunk/pkgs/misc/drivers/foo2zjs/no-hardcode-fw.diff
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/misc/drivers/foo2zjs/no-hardcode-fw.diff Sun Mar 6
16:07:53 2011 (r26179)
@@ -0,0 +1,98 @@
+#
+#
+# patch "hplj1000"
+# from [d5336e74866d31735d97874191351a0dcc092b44]
+# to [55102b37684ee5181674d19d866caec2cf603412]
+#
+============================================================
+--- a/hplj1000 d5336e74866d31735d97874191351a0dcc092b44
++++ b/hplj1000 55102b37684ee5181674d19d866caec2cf603412
+@@ -39,11 +39,6 @@ DEV=""
+ DEV=""
+
+ #
+-# Directory to find downloadable HP firmware files sihpMMMM.dl
+-#
+-FWDIR=/usr/share/foo2zjs/firmware
+-
+-#
+ # Program used to determine USB printer id information
+ #
+ # NOTE: /usr/bin is NOT mounted at this point
+@@ -83,57 +78,61 @@ case "$0" in
+ MODEL=P1005; FWMODEL=$MODEL
+ USB1=0x03f0 #Vendor
+ USB2=0x3d17 #Model
+- FWDIR=/usr/share/foo2xqx/firmware
++ DRIVER=foo2xqx
+ ;;
+ *P1006)
+ MODEL=P1006; FWMODEL=$MODEL
+ USB1=0x03f0 #Vendor
+ USB2=0x3e17 #Model
+- FWDIR=/usr/share/foo2xqx/firmware
++ DRIVER=foo2xqx
+ ;;
+ *P1007)
+ MODEL=P1007; FWMODEL=P1005 # Alias
+ USB1=0x03f0 #Vendor
+ USB2=0x4817 #Model
+- FWDIR=/usr/share/foo2xqx/firmware
++ DRIVER=foo2xqx
+ ;;
+ *P1008)
+ MODEL=P1008; FWMODEL=P1006 # Alias
+ USB1=0x03f0 #Vendor
+ USB2=0x4917 #Model
+- FWDIR=/usr/share/foo2xqx/firmware
++ DRIVER=foo2xqx
+ ;;
+ *P1505)
+ MODEL=P1505; FWMODEL=$MODEL
+ USB1=0x03f0 #Vendor
+ USB2=0x3f17 #Model
+- FWDIR=/usr/share/foo2xqx/firmware
++ DRIVER=foo2xqx
+ ;;
+ *P1505n)
+ MODEL=P1505n; FWMODEL=$MODEL
+ USB1=0x03f0 #Vendor
+ USB2=0x4017 #Model
+- FWDIR=/usr/share/foo2xqx/firmware
++ DRIVER=foo2xqx
+ ;;
+ *1000)
+ MODEL=1000; FWMODEL=$MODEL
+ USB1=0x03f0 #Vendor
+ USB2=0x0517 #Model
++ DRIVER=foo2zjs
+ ;;
+ *1005)
+ MODEL=1005; FWMODEL=$MODEL
+ USB1=0x03f0 #Vendor
+ USB2=0x1317 #Model
++ DRIVER=foo2zjs
+ ;;
+ *1018)
+ MODEL=1018; FWMODEL=$MODEL
+ USB1=0x03f0 #Vendor
+ USB2=0x4117 #Model
++ DRIVER=foo2zjs
+ ;;
+ *1020)
+ MODEL=1020; FWMODEL=$MODEL
+ USB1=0x03f0 #Vendor
+ USB2=0x2b17 #Model
++ DRIVER=foo2zjs
+ ;;
+ *)
+ log "Only HP LaserJet 100[05],1018,1020,P100[5678],P1505 are supported"
+@@ -203,7 +202,7 @@ load1() {
+ #
+ load1() {
+ _dev="$1"
+- fw="$FWDIR/sihp$FWMODEL.dl"
++ fw="${FOO2ZJS_DATADIR:-/usr/share}/$DRIVER/firmware/sihp$FWMODEL.dl"
+ if [ ! -f "$fw" ]; then
+ log "Missing HP LaserJet $MODEL firmware file $fw"
+ log "...read foo2zjs installation instructions and run ./getweb $MODEL"
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
