Various.. Added ircd-hybrid. Added USB support in SANE. Added Xsane. Added gt68xx firmware support.

svn path=/nixpkgs/trunk/; revision=9070

pkgs/misc/sane-backends/default.nix

@@ -1,4 +1,5 @@
-{stdenv, fetchurl, hotplugSupport ? false}:
+{stdenv, fetchurl, hotplugSupport ? false, libusb ? null,
+	gt68xxFirmware ? null}:
 
 assert hotplugSupport -> stdenv.system == "i686-linux";
 
@@ -10,4 +11,11 @@ stdenv.mkDerivation {
     md5 = "7ca7e2908e24721471de92cf40c75e60";
   };
   udevSupport = hotplugSupport;
+
+  buildInputs = (if libusb != null then [libusb] else []);
+
+  preInstall = (if gt68xxFirmware != null then 
+	"mkdir -p \${out}/share/sane/gt68xx ; ln -s " +  
+	(gt68xxFirmware {inherit fetchurl;})+ " \${out}/share/sane/gt68xx/PS1fw.usb "
+	 else "");
 }

pkgs/misc/sane-front/default.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl, saneBackends, libX11, gtk,
+	pkgconfig, libusb ? null}:
+stdenv.mkDerivation {
+  name = "sane-frontend";
+
+  src = fetchurl {
+    url = ftp://ftp.sane-project.org/pub/sane/sane-frontends-1.0.14/sane-frontends-1.0.14.tar.gz;
+    md5 = "c63bf7b0bb5f530cf3c08715db721cd3";
+  };
+
+  buildInputs = [saneBackends libX11 gtk pkgconfig] ++ 
+	(if (libusb != null) then [libusb] else []);
+}

pkgs/misc/xsane/default.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl, saneBackends, saneFrontends,
+	libX11, gtk, pkgconfig, libusb ? null}:
+stdenv.mkDerivation {
+  name = "xsane-0.97";
+
+  src = fetchurl {
+    url = ftp://ftp.sane-project.org/pub/sane/xsane/xsane-0.97.tar.gz;
+    md5 = "3d1f889d88c3462594febd53be58c561";
+  };
+
+  buildInputs = [saneBackends saneFrontends libX11 gtk pkgconfig ] ++
+	(if (libusb != null) then [libusb] else []);
+}