diff options
| author | Domen Kožar <domen@dev.si> | 2016-02-20 22:32:26 +0000 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-02-20 22:32:26 +0000 |
| commit | 410107cf7606ac61436f46fe52c3ccdcf0de784e (patch) | |
| tree | 5cc026f016101205458039d38da76b0c0d6a4312 /pkgs/misc/cups | |
| parent | 3e7e8e88078b6e73b7b72aa64efd87bf4feedc2c (diff) | |
| download | nixpkgs-410107cf7606ac61436f46fe52c3ccdcf0de784e.tar nixpkgs-410107cf7606ac61436f46fe52c3ccdcf0de784e.tar.gz nixpkgs-410107cf7606ac61436f46fe52c3ccdcf0de784e.tar.bz2 nixpkgs-410107cf7606ac61436f46fe52c3ccdcf0de784e.tar.lz nixpkgs-410107cf7606ac61436f46fe52c3ccdcf0de784e.tar.xz nixpkgs-410107cf7606ac61436f46fe52c3ccdcf0de784e.tar.zst nixpkgs-410107cf7606ac61436f46fe52c3ccdcf0de784e.zip | |
Revert "cups: 2.0.4 -> 2.1.2"
This reverts commit 35e1f4954555f465fb4499880dcb6a68417fb959.
Diffstat (limited to 'pkgs/misc/cups')
| -rw-r--r-- | pkgs/misc/cups/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 7dedf26096d..8fa111ecc02 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.1.2"; in +let version = "2.0.4"; 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 = "1bc1y8fjgh54ryh520gk63i5rbagn6jijsrskcqlibhfm0xwmc5s"; + sha256 = "1gaakz24k6x5nc09rmpiq0xq20j1qdjc3szag8qwmyi4ky6ydmg1"; }; buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ] @@ -51,6 +51,7 @@ 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. @@ -60,8 +61,6 @@ 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 |