Merging from trunk. I solved some trivial merge conflicts.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25188

pkgs/misc/cups/default.nix

@@ -1,17 +1,17 @@
 { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
-, dbus, libusb }:
+, dbus, libusb, acl }:
 
-let version = "1.4.4"; in
+let version = "1.4.5"; in
 
 stdenv.mkDerivation {
   name = "cups-${version}";
 
   src = fetchurl {
     url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2";
-    md5 = "8776403ad60fea9e85eab9c04d88560d";
+    sha256 = "1zhf3hvx11i0qnbwyybmdhx4fxkxfd4ch69k59fj5bz8wvcdcl04";
   };
 
-  buildInputs = [ pkgconfig zlib libjpeg libpng libtiff pam dbus libusb ];
+  buildInputs = [ pkgconfig zlib libjpeg libpng libtiff pam dbus libusb acl ];
 
   propagatedBuildInputs = [ openssl ];
 
@@ -39,5 +39,7 @@ stdenv.mkDerivation {
     homepage = http://www.cups.org/;
     description = "A standards-based printing system for UNIX";
     license = "GPLv2"; # actually LGPL for the library and GPL for the rest
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/misc/cups/pdf-filter.nix

@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, pkgconfig, cups, poppler }:
+
+let version = "1.4.5"; in
+
+stdenv.mkDerivation {
+  name = "cups-pdf-filter-${version}";
+
+  src = fetchurl {
+    url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2";
+    sha256 = "1zhf3hvx11i0qnbwyybmdhx4fxkxfd4ch69k59fj5bz8wvcdcl04";
+  };
+
+  buildInputs = [ pkgconfig cups poppler ];
+
+  preConfigure = ''
+    sed -e 's@\.\./cups/$(LIBCUPS)@@' -e 's@$(LIBCUPSIMAGE)@@' -i filter/Makefile
+    ''; 
+
+  NIX_LDFLAGS="-L${cups}/lib";
+
+  configureFlags = ''
+    --localstatedir=/var --enable-dbus
+    --enable-image --with-pdftops=pdftops'';
+
+  buildPhase = ''
+    cd filter
+    make pdftops
+    '';
+
+  installPhase = ''
+    mkdir -pv $out/lib/cups/filter
+    cp -v pdftops $out/lib/cups/filter
+    '';
+
+
+  meta = {
+    homepage = http://www.cups.org/;
+    description = "Image and pdf filters for CUPS";
+    license = "GPLv2";
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}