diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-03-26 13:30:45 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-03-26 13:30:54 -0700 |
| commit | 032859faba7174ef69f96b53bc07d544fba5e871 (patch) | |
| tree | 8951c5ea416650282feac464b7e406e3fcc52a91 /pkgs/misc/cups | |
| parent | eff828a27534c07b0b730ef560ec48f9f2b773fb (diff) | |
| download | nixlib-032859faba7174ef69f96b53bc07d544fba5e871.tar nixlib-032859faba7174ef69f96b53bc07d544fba5e871.tar.gz nixlib-032859faba7174ef69f96b53bc07d544fba5e871.tar.bz2 nixlib-032859faba7174ef69f96b53bc07d544fba5e871.tar.lz nixlib-032859faba7174ef69f96b53bc07d544fba5e871.tar.xz nixlib-032859faba7174ef69f96b53bc07d544fba5e871.tar.zst nixlib-032859faba7174ef69f96b53bc07d544fba5e871.zip | |
cups: 1.7.5 -> 2.0.2
Diffstat (limited to 'pkgs/misc/cups')
| -rw-r--r-- | pkgs/misc/cups/default.nix | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 883de8d2b9db..68972c2e6c36 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 }: +, dbus, acl +, 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 ]; - 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. |