diff options
| author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-08-22 08:24:13 +0200 |
|---|---|---|
| committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-08-22 08:24:13 +0200 |
| commit | 6ced9298c75b3f06350ab9a14109238ca3d1447f (patch) | |
| tree | afb0fe6d1e5bf60065e4d151470e2c6f0ca061db /pkgs | |
| parent | 32d823d3d0b1b06765d288fb7da8402956052509 (diff) | |
| download | nixlib-6ced9298c75b3f06350ab9a14109238ca3d1447f.tar nixlib-6ced9298c75b3f06350ab9a14109238ca3d1447f.tar.gz nixlib-6ced9298c75b3f06350ab9a14109238ca3d1447f.tar.bz2 nixlib-6ced9298c75b3f06350ab9a14109238ca3d1447f.tar.lz nixlib-6ced9298c75b3f06350ab9a14109238ca3d1447f.tar.xz nixlib-6ced9298c75b3f06350ab9a14109238ca3d1447f.tar.zst nixlib-6ced9298c75b3f06350ab9a14109238ca3d1447f.zip | |
cups: keep versioning in all-packages.nix, as it is in master
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/misc/cups/default.nix | 4 | ||||
| -rw-r--r-- | 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 { }; |