public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "cups: 2.0.4 -> 2.1.2"

Browse Source 
This reverts commit 35e1f4954555f465fb4499880dcb6a68417fb959.
This commit is contained in:
Domen Kožar 2016-02-20 22:32:26 +00:00
parent 3e7e8e8807
commit 410107cf76
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/misc/cups/default.nix
View File

@ -3,7 +3,7 @@
, libusb ? null, gnutls ? null, avahi ? null, libpaper ? null , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
}: }:
let version = "2.1.2"; in let version = "2.0.4"; in
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation { stdenv.mkDerivation {
@ -13,7 +13,7 @@ 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 = "1bc1y8fjgh54ryh520gk63i5rbagn6jijsrskcqlibhfm0xwmc5s"; sha256 = "1gaakz24k6x5nc09rmpiq0xq20j1qdjc3szag8qwmyi4ky6ydmg1";
}; };
buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ] buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ]
@ -51,6 +51,7 @@ stdenv.mkDerivation {
# Idem for /etc. # Idem for /etc.
"PAMDIR=$(out)/etc/pam.d" "PAMDIR=$(out)/etc/pam.d"
"DBUSDIR=$(out)/etc/dbus-1" "DBUSDIR=$(out)/etc/dbus-1"
"INITDIR=$(out)/etc/rc.d"
"XINETD=$(out)/etc/xinetd.d" "XINETD=$(out)/etc/xinetd.d"
"SERVERROOT=$(out)/etc/cups" "SERVERROOT=$(out)/etc/cups"
# Idem for /usr. # Idem for /usr.
@ -60,8 +61,6 @@ stdenv.mkDerivation {
"CUPS_PRIMARY_SYSTEM_GROUP=root" "CUPS_PRIMARY_SYSTEM_GROUP=root"
]; ];
enableParallelBuilding = true;
postInstall = '' postInstall = ''
# Delete obsolete stuff that conflicts with cups-filters. # Delete obsolete stuff that conflicts with cups-filters.
rm -rf $out/share/cups/banners $out/share/cups/data/testprint rm -rf $out/share/cups/banners $out/share/cups/data/testprint