summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2007-08-08 20:33:36 +0000
committerMichael Raskin <7c6f434c@mail.ru>2007-08-08 20:33:36 +0000
commit4d54140043c984f30f646384b40bb9058553f010 (patch)
tree23a11567e6833472fa053fa0f423a65a24ad8471 /pkgs/top-level
parent681551d96c81032f919ff713c091dfc2bd042085 (diff)
downloadnixlib-4d54140043c984f30f646384b40bb9058553f010.tar
nixlib-4d54140043c984f30f646384b40bb9058553f010.tar.gz
nixlib-4d54140043c984f30f646384b40bb9058553f010.tar.bz2
nixlib-4d54140043c984f30f646384b40bb9058553f010.tar.lz
nixlib-4d54140043c984f30f646384b40bb9058553f010.tar.xz
nixlib-4d54140043c984f30f646384b40bb9058553f010.tar.zst
nixlib-4d54140043c984f30f646384b40bb9058553f010.zip
Various.. Added ircd-hybrid. Added USB support in SANE. Added Xsane. Added gt68xx firmware support.
svn path=/nixpkgs/trunk/; revision=9070
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix23
1 files changed, 22 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d95a447648a6..e146f2718c8c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2225,6 +2225,10 @@ rec {
     inherit fetchurl stdenv ;
   };
 
+  ircdHybrid = import ../servers/irc/ircd-hybrid {
+		inherit fetchurl stdenv openssl zlib;
+	};
+
   jetty = import ../servers/http/jetty {
     inherit fetchurl stdenv unzip;
   };
@@ -3630,7 +3634,16 @@ rec {
   };
 
   saneBackends = import ../misc/sane-backends {
-    inherit fetchurl stdenv;
+    inherit fetchurl stdenv libusb;
+	gt68xxFirmware = 
+		getConfig ["sane" "gt68xxFirmware"] null;
+  };
+
+  saneFrontends = import ../misc/sane-front {
+    inherit fetchurl stdenv pkgconfig libusb
+	saneBackends;
+    inherit (gtkLibs) gtk;
+    inherit (xlibs) libX11;
   };
 
   synaptics = import ../misc/synaptics {
@@ -3677,4 +3690,12 @@ rec {
     inherit (gtkLibs) gtk;
   };*/
 
+  xsane = import ../misc/xsane {
+    inherit fetchurl stdenv pkgconfig libusb
+	saneBackends saneFrontends;
+    inherit (gtkLibs) gtk;
+    inherit (xlibs) libX11;
+  };
+
+
 }