diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-03-26 13:30:45 -0700 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-05-10 12:41:20 +0200 |
| commit | d6edaea4f76b7602dfd90449d7edf0b7f05bffb6 (patch) | |
| tree | b8b89007a8cd2957a6253b9119725beaa3d86d7f /pkgs | |
| parent | bbcc0c0f07d931713091bed74ca5c496f8e20acd (diff) | |
| download | nixpkgs-d6edaea4f76b7602dfd90449d7edf0b7f05bffb6.tar nixpkgs-d6edaea4f76b7602dfd90449d7edf0b7f05bffb6.tar.gz nixpkgs-d6edaea4f76b7602dfd90449d7edf0b7f05bffb6.tar.bz2 nixpkgs-d6edaea4f76b7602dfd90449d7edf0b7f05bffb6.tar.lz nixpkgs-d6edaea4f76b7602dfd90449d7edf0b7f05bffb6.tar.xz nixpkgs-d6edaea4f76b7602dfd90449d7edf0b7f05bffb6.tar.zst nixpkgs-d6edaea4f76b7602dfd90449d7edf0b7f05bffb6.zip | |
cups: 1.7.5 -> 2.0.2
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/misc/cups/default.nix | 25 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 23 insertions, 6 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index e62cfcff832..d2170cfc332 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,8 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl -, dbus, libusb, acl, gmp }: +, dbus, acl, gmp +, libusb ? null, gnutls ? null, avahi ? null, libpaper ? null +}: -let version = "1.7.5"; in +let version = "2.0.2"; in +with stdenv.lib; stdenv.mkDerivation { name = "cups-${version}"; @@ -10,15 +13,27 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2"; - sha256 = "00mx4rpiqw9cwx46bd3hd5lcgmcxy63zfnmkr02smanv8xl4rjqq"; + sha256 = "12xild9nrhqnrzx8zqh78v3chm4mpp5gf5iamr0h9zb6dgvj11w5"; }; - buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ] + buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ] ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ; propagatedBuildInputs = [ openssl gmp ]; - configureFlags = "--localstatedir=/var --sysconfdir=/etc --enable-dbus"; # --with-dbusdir + configureFlags = [ + "--localstatedir=/var" + "--sysconfdir=/etc" + "--with-systemd=\${out}/lib/systemd/system" + "--enable-raw-printing" + "--enable-threads" + ] ++ optionals stdenv.isLinux [ + "--enable-dbus" + "--enable-pam" + ] ++ optional (libusb != null) "--enable-libusb" + ++ optional (gnutls != null) "--enable-ssl" + ++ optional (avahi != null) "--enable-avahi" + ++ optional (libpaper != null) "--enable-libpaper"; installFlags = [ # Don't try to write in /var at build time. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 004420ddfb7..4ba211f9e59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13942,7 +13942,9 @@ let beep = callPackage ../misc/beep { }; - cups = callPackage ../misc/cups { libusb = libusb1; }; + cups = callPackage ../misc/cups { + libusb = libusb1; + }; cups_filters = callPackage ../misc/cups/filters.nix { }; |