diff options
| author | Domen Kožar <domen@dev.si> | 2015-03-31 16:50:38 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-03-31 16:51:07 +0200 |
| commit | 146eb665d0fd660260992b7730ddab9af5801239 (patch) | |
| tree | fab4cab69ff2db182d7445888af02bb57e194a9c | |
| parent | 0d9ebe7535140c795738d9876f1792695a440af0 (diff) | |
| download | nixlib-146eb665d0fd660260992b7730ddab9af5801239.tar nixlib-146eb665d0fd660260992b7730ddab9af5801239.tar.gz nixlib-146eb665d0fd660260992b7730ddab9af5801239.tar.bz2 nixlib-146eb665d0fd660260992b7730ddab9af5801239.tar.lz nixlib-146eb665d0fd660260992b7730ddab9af5801239.tar.xz nixlib-146eb665d0fd660260992b7730ddab9af5801239.tar.zst nixlib-146eb665d0fd660260992b7730ddab9af5801239.zip | |
Revert "cups: 1.7.5 -> 2.0.2"
This reverts commit 032859faba7174ef69f96b53bc07d544fba5e871. Conflicts: pkgs/misc/cups/default.nix Breaks nixos printing tests, see https://github.com/NixOS/nixpkgs/commit/032859faba7174ef69f96b53bc07d544fba5e871#commitcomment-10495609
| -rw-r--r-- | pkgs/misc/cups/default.nix | 25 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 6 insertions, 23 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index d2170cfc332f..e62cfcff8327 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,11 +1,8 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl -, dbus, acl, gmp -, libusb ? null, gnutls ? null, avahi ? null, libpaper ? null -}: +, dbus, libusb, acl, gmp }: -let version = "2.0.2"; in +let version = "1.7.5"; in -with stdenv.lib; stdenv.mkDerivation { name = "cups-${version}"; @@ -13,27 +10,15 @@ stdenv.mkDerivation { src = fetchurl { 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 ] ; propagatedBuildInputs = [ openssl gmp ]; - configureFlags = [ - "--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"; + configureFlags = "--localstatedir=/var --sysconfdir=/etc --enable-dbus"; # --with-dbusdir installFlags = [ # Don't try to write in /var at build time. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31c2bb7d91b7..ab11bf12bb04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13578,9 +13578,7 @@ let beep = callPackage ../misc/beep { }; - cups = callPackage ../misc/cups { - libusb = libusb1; - }; + cups = callPackage ../misc/cups { libusb = libusb1; }; cups_filters = callPackage ../misc/cups/filters.nix { }; |