diff options
| author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-06-28 23:04:28 +0200 |
|---|---|---|
| committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-07-01 07:52:13 +0200 |
| commit | fe622f65232d16808e7be51cb4451a10375a6e24 (patch) | |
| tree | 285ad257005f4bdb7db8b792a7ad0e0bbe941346 /pkgs/misc | |
| parent | 270ba268d7b8f5a1dbc430259f2500bdf6eaed79 (diff) | |
upgrade some packages to libusb1
on my systems, I can now override "libusb = libusb1" in all of nixpkgs so perhaps we can soon drop libusb 0.1 support?
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/cups/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index ad25b4180b5bb..bb1f60ed5db01 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 @@ -13,7 +13,7 @@ stdenv.mkDerivation { md5 = "de3006e5cf1ee78a9c6145ce62c4e982"; }; - 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 ]; |