diff options
| author | Domen Kožar <domen@dev.si> | 2016-02-26 11:13:30 +0000 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-02-26 11:13:30 +0000 |
| commit | a469681a5107fc72fbb724c2f01989358249fc10 (patch) | |
| tree | 108a86535e8bd19b646df356e2bb694db2054ca9 /pkgs | |
| parent | c99d589162a488a2380152a505e40f0d62586e42 (diff) | |
| parent | 8b124b752179a5e28dc75bf4adbfd6f49bb85cdb (diff) | |
| download | nixlib-a469681a5107fc72fbb724c2f01989358249fc10.tar nixlib-a469681a5107fc72fbb724c2f01989358249fc10.tar.gz nixlib-a469681a5107fc72fbb724c2f01989358249fc10.tar.bz2 nixlib-a469681a5107fc72fbb724c2f01989358249fc10.tar.lz nixlib-a469681a5107fc72fbb724c2f01989358249fc10.tar.xz nixlib-a469681a5107fc72fbb724c2f01989358249fc10.tar.zst nixlib-a469681a5107fc72fbb724c2f01989358249fc10.zip | |
Merge pull request #13365 from abbradar/cups-second-attempt
CUPS update (second attempt)
Diffstat (limited to 'pkgs')
| -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 82fd1d65baf5..437300650419 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -5,7 +5,7 @@ ### IMPORTANT: before updating cups, make sure the nixos/tests/printing.nix test ### works at least for your platform. -let version = "2.0.4"; in +let version = "2.1.3"; in with stdenv.lib; stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2"; - sha256 = "1gaakz24k6x5nc09rmpiq0xq20j1qdjc3szag8qwmyi4ky6ydmg1"; + sha256 = "1lyl3z01xhg9xb9c8m42398c6h9kw8qr6jwiv8bjdsjab11hv9rn"; }; buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ] @@ -53,7 +53,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. @@ -63,6 +62,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 |