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

Revert "cups: 1.7.5 -> 2.0.2"

Browse Source 
This reverts commit 032859faba7174ef69f96b53bc07d544fba5e871.

Conflicts:
	pkgs/misc/cups/default.nix

Breaks nixos printing tests, see
032859faba (commitcomment-10495609)
This commit is contained in:
Domen Kožar 2015-03-31 16:50:38 +02:00
parent 0d9ebe7535
commit 146eb665d0
2 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,8 @@
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
, dbus, acl, gmp , dbus, libusb, acl, gmp }:
, libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
}:
let version = "2.0.2"; in let version = "1.7.5"; in
with stdenv.lib;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "cups-${version}"; name = "cups-${version}";
@ -13,27 +10,15 @@ 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 = "12xild9nrhqnrzx8zqh78v3chm4mpp5gf5iamr0h9zb6dgvj11w5"; sha256 = "00mx4rpiqw9cwx46bd3hd5lcgmcxy63zfnmkr02smanv8xl4rjqq";
}; };
buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ] buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ]
++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ; ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ;
propagatedBuildInputs = [ openssl gmp ]; propagatedBuildInputs = [ openssl gmp ];
configureFlags = [ configureFlags = "--localstatedir=/var --sysconfdir=/etc --enable-dbus"; # --with-dbusdir
"--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 = installFlags =
[ # Don't try to write in /var at build time. [ # Don't try to write in /var at build time.

4
pkgs/top-level/all-packages.nix
View File

@ -13578,9 +13578,7 @@ let
beep = callPackage ../misc/beep { }; beep = callPackage ../misc/beep { };
cups = callPackage ../misc/cups { cups = callPackage ../misc/cups { libusb = libusb1; };
libusb = libusb1;
};
cups_filters = callPackage ../misc/cups/filters.nix { }; cups_filters = callPackage ../misc/cups/filters.nix { };