* Updated GTK+, Glib.

* Build GTK+ with CUPS support (mostly to get decent printing in
  Firefox).

svn path=/nixpkgs/trunk/; revision=17951

pkgs/development/libraries/gtk-libs/2.18/default.nix

@@ -8,9 +8,11 @@ rec {
 
   pango = (import ./pango) (args // { inherit glib cairo; });
 
-  gtk = (import ./gtk+) (args // {
-    inherit glib atk pango;
-  });
+  gtk = import ./gtk+ {
+    inherit stdenv fetchurl pkgconfig x11 glib atk pango libtiff
+      libjpeg libpng cairo libXrandr libXinerama perl jasper
+      cups openssl;
+  };
 
   glibmm = (import ./glibmm) (args // { inherit glib; });
 

pkgs/development/libraries/gtk-libs/2.18/glib/default.nix

@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation rec {
-  name = "glib-2.22.0";
+  name = "glib-2.22.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/2.22/${name}.tar.bz2";
-    sha256 = "0wd6r0bdrrd9k1ipryf5dfk8cf5vcnhiib49s5x5xskwzaaxlz7p";
+    sha256 = "18ycpaf69wlpp4wq385hkq7bcfhbis8ncd7wl7zmwgrdzh11v954";
   };
 
   buildInputs = [pkgconfig gettext perl];

pkgs/development/libraries/gtk-libs/2.18/gtk+/default.nix

@@ -1,19 +1,27 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, x11, glib, atk, pango, libtiff, libjpeg
+, libpng, cairo, libXrandr, perl, jasper
+, xineramaSupport ? true, libXinerama ? null
+, cupsSupport ? true, cups ? null, openssl ? null
+}:
+
+assert xineramaSupport -> libXinerama != null;
+assert cupsSupport -> cups != null && openssl != null;
 
 stdenv.mkDerivation rec {
-  name = "gtk+-2.18.0";
+  name = "gtk+-2.18.3";
   
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/2.18/${name}.tar.bz2";
-    sha256 = "0hfjib98m47nrmv31h6k82fz35hzahykhifdsi5afy5yglrfkz05";
+    sha256 = "1gv8lx7a00yp95ss0vzvmda4nv213m8adjdkx18hhmhaavz6a1hw";
   };
   
   buildInputs = [ pkgconfig perl jasper ];
   
-  propagatedBuildInputs = [
-    x11 glib atk pango libtiff libjpeg libpng cairo libXrandr
-  ] ++ stdenv.lib.optional xineramaSupport libXinerama;
-    
+  propagatedBuildInputs =
+    [ x11 glib atk pango libtiff libjpeg libpng cairo libXrandr ]
+    ++ stdenv.lib.optional xineramaSupport libXinerama
+    ++ stdenv.lib.optionals cupsSupport [ cups openssl ];
+
   passthru = { inherit libtiff libjpeg libpng; };
 
   meta = {

pkgs/development/libraries/gtk-libs/2.18/pango/default.nix

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1hx6v6w3xk9wfcrb26gg7rrfl6m6ykxk2bqm67aqdzql4vysxgz1";
   };
 
-  buildInputs = [pkgconfig] ++ (if stdenv.system == "i686-darwin" then [gettext] else []);
+  buildInputs = [pkgconfig] ++ stdenv.lib.optional (stdenv.system == "i686-darwin") gettext;
 
   propagatedBuildInputs = [x11 glib cairo libpng];
 

pkgs/top-level/all-packages.nix

@@ -3590,7 +3590,8 @@ let
 
   gtkLibs218 = import ../development/libraries/gtk-libs/2.18 {
     inherit fetchurl stdenv pkgconfig gettext perl x11 jasper
-            libtiff libjpeg libpng cairo libsigcxx cairomm;
+            libtiff libjpeg libpng cairo libsigcxx cairomm cups
+            openssl;
     inherit (xlibs) libXinerama libXrandr;
     xineramaSupport = true;
   };
@@ -4111,7 +4112,7 @@ let
     pythonSupport = true;
   };
 
-  libxslt = import ../development/libraries/libxslt {
+  libxslt = makeOverridable (import ../development/libraries/libxslt) {
     inherit fetchurl stdenv libxml2;
   };