cups: Update to 1.5.4

This commit is contained in:
Eelco Dolstra 2012-10-08 14:50:19 -04:00
parent f5e0a05f80
commit c961c840f6

View File

@ -1,9 +1,8 @@
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
, dbus, libusb, acl }: , dbus, libusb1, acl }:
let version = "1.5.4"; in
let
version = "1.5.2";
in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "cups-${version}"; name = "cups-${version}";
@ -11,10 +10,10 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"; url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2";
sha256 = "1yw7l5rq93zg91akqf68b871frrs4q0krc9cx43ly7v3ih8all5i"; md5 = "de3006e5cf1ee78a9c6145ce62c4e982";
}; };
buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ] buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb1 ]
++ stdenv.lib.optionals stdenv.isLinux [ pam dbus acl ] ; ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus acl ] ;
propagatedBuildInputs = [ openssl ]; propagatedBuildInputs = [ openssl ];