From 4e7741d694c026da880b7b218b3e1ca3ce887d24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 29 Mar 2013 02:01:03 +0100
Subject: [PATCH] gtk2 platform: minor updates

Also make glib use libelf (a few hudred kBs).
---
 pkgs/development/libraries/gdk-pixbuf/default.nix |  6 +++---
 pkgs/development/libraries/glib/default.nix       | 10 +++++-----
 pkgs/development/libraries/gtk+/2.x.nix           |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 532318b334b8..e9305badef47 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -2,11 +2,11 @@
 , jasper }:
 
 stdenv.mkDerivation rec {
-  name = "gdk-pixbuf-2.26.5";
+  name = "gdk-pixbuf-2.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gdk-pixbuf/2.26/${name}.tar.xz";
-    sha256 = "112w3xl16vam72d5mj1gvs1dgr0aipbxp0qq189mmadwcg8nysbp";
+    url = "mirror://gnome/sources/gdk-pixbuf/2.28/${name}.tar.xz";
+    sha256 = "0iykaw95xp5pids16nz7xqh26nzhwsigrcw8jma0f6zvbdlkf7jn";
   };
 
   # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 3ea277181148..93493a3abdad 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gettext, perl, libiconvOrNull, zlib, libffi
-, python, pcre }:
+, python, pcre, libelf }:
 
 # TODO:
 # * Add gio-module-fam
@@ -12,15 +12,15 @@
 #       $out/bin/gtester-report' to postInstall if this is solved
 
 stdenv.mkDerivation (rec {
-  name = "glib-2.34.3";
+  name = "glib-2.36.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/glib/2.34/${name}.tar.xz";
-    sha256 = "19sq4rhl2vr8ikjvl8qh51vr38yqfhbkb3imi2s6ac5rgkwcnpw5";
+    url = "mirror://gnome/sources/glib/2.36/${name}.tar.xz";
+    sha256 = "09xjkg5kaz4j0m25jizvz7ra48bmdawibykzri5igicjhsz8lnj5";
   };
 
   # configure script looks for d-bus but it is only needed for tests
-  buildInputs = [ libiconvOrNull ];
+  buildInputs = [ libiconvOrNull libelf ];
 
   nativeBuildInputs = [ perl pkgconfig gettext python ];
 
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index f899db0e18f5..da64fe1fe247 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null;
 assert cupsSupport -> cups != null;
 
 stdenv.mkDerivation rec {
-  name = "gtk+-2.24.16";
+  name = "gtk+-2.24.17";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz";
-    sha256 = "1lq2jdpxy2diczlplllclhl6jakm4i5ay35566ma7ygc5k66kkck";
+    sha256 = "05gl82k82w3gjrzr4vmj3ski7mp1b0jbhc49wgl9hv8mc2sb4iz9";
   };
 
   enableParallelBuilding = true;