MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cups: 1.7.5 -> 2.0.2

Browse source
This commit is contained in:
William A. Kennington III 2015-03-26 13:30:45 -07:00
parent eff828a275
commit 032859faba
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/misc/cups/default.nix
View file

@ -1,8 +1,11 @@
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl { 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 { stdenv.mkDerivation {
name = "cups-${version}"; name = "cups-${version}";
@ -10,15 +13,27 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2"; 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 ] ; ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ;
propagatedBuildInputs = [ openssl ]; 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 = installFlags =
[ # Don't try to write in /var at build time. [ # Don't try to write in /var at build time.

4
pkgs/top-level/all-packages.nix
View file

@ -13534,7 +13534,9 @@ let
beep = callPackage ../misc/beep { }; beep = callPackage ../misc/beep { };
cups = callPackage ../misc/cups { libusb = libusb1; }; cups = callPackage ../misc/cups {
libusb = libusb1;
};
cups_filters = callPackage ../misc/cups/filters.nix { }; cups_filters = callPackage ../misc/cups/filters.nix { };