From 20d949a6f51470299dcc28b188eef76ca7d94085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 7 Jun 2010 08:24:06 +0000 Subject: [PATCH] Adding libusb to cups, so it can access usb printers. svn path=/nixpkgs/trunk/; revision=22163 --- pkgs/misc/cups/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 73d665bcc0eb..0b8830a7bdce 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -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 @@ stdenv.mkDerivation { }) ]; - buildInputs = [ pkgconfig zlib libjpeg libpng libtiff pam dbus ]; + buildInputs = [ pkgconfig zlib libjpeg libpng libtiff pam dbus libusb ]; propagatedBuildInputs = [ openssl ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62e2adea7662..48a72abcd577 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9551,7 +9551,7 @@ let }; 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 {