From 2bdf38dab299dd19d6c6e70ae42eb5b8b4d5b217 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 24 Oct 2009 17:29:37 +0000
Subject: [PATCH] * Updated GTK+, Glib. * Build GTK+ with CUPS support (mostly
 to get decent printing in   Firefox).

svn path=/nixpkgs/trunk/; revision=17951
---
 .../libraries/gtk-libs/2.18/default.nix       |  8 ++++---
 .../libraries/gtk-libs/2.18/glib/default.nix  |  4 ++--
 .../libraries/gtk-libs/2.18/gtk+/default.nix  | 22 +++++++++++++------
 .../libraries/gtk-libs/2.18/pango/default.nix |  2 +-
 pkgs/top-level/all-packages.nix               |  5 +++--
 5 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/gtk-libs/2.18/default.nix b/pkgs/development/libraries/gtk-libs/2.18/default.nix
index 89abc0e6208..c31203857ed 100644
--- a/pkgs/development/libraries/gtk-libs/2.18/default.nix
+++ b/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; });
 
diff --git a/pkgs/development/libraries/gtk-libs/2.18/glib/default.nix b/pkgs/development/libraries/gtk-libs/2.18/glib/default.nix
index 666520b1930..852afc0d943 100644
--- a/pkgs/development/libraries/gtk-libs/2.18/glib/default.nix
+++ b/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];
diff --git a/pkgs/development/libraries/gtk-libs/2.18/gtk+/default.nix b/pkgs/development/libraries/gtk-libs/2.18/gtk+/default.nix
index d5d2c8ffec3..3a47c9d73e1 100644
--- a/pkgs/development/libraries/gtk-libs/2.18/gtk+/default.nix
+++ b/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 = {
diff --git a/pkgs/development/libraries/gtk-libs/2.18/pango/default.nix b/pkgs/development/libraries/gtk-libs/2.18/pango/default.nix
index b152aaba5ef..8684b82bd0b 100644
--- a/pkgs/development/libraries/gtk-libs/2.18/pango/default.nix
+++ b/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];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ab1464a047..18a5a82785e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/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;
   };