From 6ced9298c75b3f06350ab9a14109238ca3d1447f Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 22 Aug 2013 08:24:13 +0200
Subject: [PATCH] cups: keep versioning in all-packages.nix, as it is in master

---
 pkgs/misc/cups/default.nix      | 4 ++--
 pkgs/top-level/all-packages.nix | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 471fbcdc4645..922c59f37c04 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
-, dbus, libusb1, acl }:
+, dbus, libusb, acl }:
 
 let version = "1.5.4"; in
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   # FIXME: Split off the cups client library.
   outputs = [ "dev" "out" "doc" "man" ];
 
-  buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb1 ]
+  buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ]
     ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ;
 
   propagatedBuildInputs = [ openssl ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ad8731a7c1f..d8ea5a963bbd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9630,6 +9630,7 @@ let
 
   cups = callPackage ../misc/cups {
     stdenv = stdenvMulti;
+    libusb = libusb1;
   };
 
   cups_pdf_filter = callPackage ../misc/cups/pdf-filter.nix { };