Author: viric
Date: 2010-06-07 08:24:06 +0000 (Mon, 07 Jun 2010)
New Revision: 22163

You can view the changes in this commit at:
   https://svn.nixos.org/viewvc/nix?rev=22163&view=rev

Modified:
   nixpkgs/trunk/pkgs/misc/cups/default.nix
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Log:
Adding libusb to cups, so it can access usb printers.

Changes:

Modified: nixpkgs/trunk/pkgs/misc/cups/default.nix
===================================================================
--- nixpkgs/trunk/pkgs/misc/cups/default.nix    2010-06-06 22:39:28 UTC (rev 
22162)
+++ nixpkgs/trunk/pkgs/misc/cups/default.nix    2010-06-07 08:24:06 UTC (rev 
22163)
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl, 
dbus }:
+{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
+, dbus, libusb }:
 
 let version = "1.4.1"; in
 
@@ -17,7 +18,7 @@
       })
     ];
 
-  buildInputs = [ pkgconfig zlib libjpeg libpng libtiff pam dbus ];
+  buildInputs = [ pkgconfig zlib libjpeg libpng libtiff pam dbus libusb ];
 
   propagatedBuildInputs = [ openssl ];
 

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
===================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix       2010-06-06 22:39:28 UTC 
(rev 22162)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix       2010-06-07 08:24:06 UTC 
(rev 22163)
@@ -9551,7 +9551,7 @@
   };
 
   cups = import ../misc/cups {
-    inherit fetchurl stdenv pkgconfig zlib libjpeg libpng libtiff pam openssl 
dbus;
+    inherit fetchurl stdenv pkgconfig zlib libjpeg libpng libtiff pam openssl 
dbus libusb;
   };
 
   gutenprint = import ../misc/drivers/gutenprint {

_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to