mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 07:01:54 +00:00
cups: 1.7.5 -> 2.0.2
This commit is contained in:
parent
de02c8e880
commit
862510079a
@ -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.
|
||||
|
@ -13983,7 +13983,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 { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user