diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-01-13 19:46:41 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-01-17 15:50:40 +0300 |
| commit | 35e1f4954555f465fb4499880dcb6a68417fb959 (patch) | |
| tree | c39ffc1f4d131325f8f1ed5ab054aec2584ec00a /pkgs/misc/cups/default.nix | |
| parent | 1967f19f7db4029120b2df3e0ec5bc30e5144598 (diff) | |
| download | nixpkgs-35e1f4954555f465fb4499880dcb6a68417fb959.tar nixpkgs-35e1f4954555f465fb4499880dcb6a68417fb959.tar.gz nixpkgs-35e1f4954555f465fb4499880dcb6a68417fb959.tar.bz2 nixpkgs-35e1f4954555f465fb4499880dcb6a68417fb959.tar.lz nixpkgs-35e1f4954555f465fb4499880dcb6a68417fb959.tar.xz nixpkgs-35e1f4954555f465fb4499880dcb6a68417fb959.tar.zst nixpkgs-35e1f4954555f465fb4499880dcb6a68417fb959.zip | |
cups: 2.0.4 -> 2.1.2
Also enable parallel building and don't install rc.d scripts.
Diffstat (limited to 'pkgs/misc/cups/default.nix')
| -rw-r--r-- | pkgs/misc/cups/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 8fa111ecc02..7dedf26096d 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -3,7 +3,7 @@ , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null }: -let version = "2.0.4"; in +let version = "2.1.2"; in with stdenv.lib; stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2"; - sha256 = "1gaakz24k6x5nc09rmpiq0xq20j1qdjc3szag8qwmyi4ky6ydmg1"; + sha256 = "1bc1y8fjgh54ryh520gk63i5rbagn6jijsrskcqlibhfm0xwmc5s"; }; buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ] @@ -51,7 +51,6 @@ stdenv.mkDerivation { # Idem for /etc. "PAMDIR=$(out)/etc/pam.d" "DBUSDIR=$(out)/etc/dbus-1" - "INITDIR=$(out)/etc/rc.d" "XINETD=$(out)/etc/xinetd.d" "SERVERROOT=$(out)/etc/cups" # Idem for /usr. @@ -61,6 +60,8 @@ stdenv.mkDerivation { "CUPS_PRIMARY_SYSTEM_GROUP=root" ]; + enableParallelBuilding = true; + postInstall = '' # Delete obsolete stuff that conflicts with cups-filters. rm -rf $out/share/cups/banners $out/share/cups/data/testprint |