* Merged the stdenv branch

(https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

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

pkgs/development/libraries/gtk-libs/2.12/atk/default.nix

@@ -1,10 +1,10 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "atk-1.12.4";
+  name = "atk-1.20.0";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/gnome/sources/atk/1.22/atk-1.22.0.tar.bz2;
-    sha256 = "1sax4a63v7vy2f23lqgy33956nglas9vyh4dq91914gwl3lnczb7";
+    url = mirror://gnome/sources/atk/1.20/atk-1.20.0.tar.bz2;
+    sha256 = "1ja76wd40ibmvgqhl2rnwk217znb7rnccw29jah8s3avpcn2yfqz";
   };
   buildInputs = [pkgconfig perl];
   propagatedBuildInputs = [glib];

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

@@ -2,9 +2,16 @@ args: with args;
 
 stdenv.mkDerivation {
   name = "glib-2.16.3";
+  
   src = fetchurl {
-    url = ftp://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-2.16.3.tar.bz2;
-    sha256 = "0zc8irn9zx8j37ih3jiwhqrkq2ddpv4x93pcj7c45f676ji449sn";
+    url = mirror://gnome/sources/glib/2.16/glib-2.16.3.tar.bz2;
+    md5 = "195f9a803cc5279dbb39afdf985f44cb";
   };
+  
   buildInputs = [pkgconfig gettext perl];
+
+  meta = {
+    description = "A C library providing non-GUI functionality";
+    homepage = http://www.gtk.org/;
+  };
 }

pkgs/development/libraries/gtk-libs/2.12/glibmm/default.nix

@@ -1,13 +1,12 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "glibmm-2.16.1";
+  name = "glibmm-2.16.2";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.16/glibmm-2.16.1.tar.bz2;
-    sha256 = "0x710y9pkn4nfhl95dqfk90bk29qr5alzqxdl3l1n6af5yl2yn3i";
+    url = mirror://gnome/GNOME/sources/glibmm/2.16/glibmm-2.16.2.tar.bz2;
+    sha256 = "0a3d4z3kzbr84pg873397nja6wc6810pw233rvn1gz1jkkrzcczh";
   };
 
   buildInputs = [pkgconfig];
   propagatedBuildInputs = [glib libsigcxx];
 }
-

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

@@ -1,13 +1,23 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "gtk+-2.12.9";
+  name = "gtk+-2.12.10";
+  
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.12/gtk+-2.12.9.tar.bz2;
-    sha256 = "1j0fil4rzvkrlq3mwpb5mpwks1h5sk580qq54l69y99incgvznav";
+    url = mirror://gnome/sources/gtk+/2.12/gtk+-2.12.10.tar.bz2;
+    md5 = "5fcbdd2254eedb6b9ae828afc01d9eaa";
   };
-  buildInputs = [ pkgconfig perl ];
-  propagatedBuildInputs = [x11 glib atk pango libtiff libjpeg libpng cairo
-    libXrandr (if xineramaSupport then libXinerama else null)];
+  
+  buildInputs = [pkgconfig perl];
+  
+  propagatedBuildInputs = [
+    x11 glib atk pango libtiff libjpeg libpng cairo libXrandr
+  ] ++ stdenv.lib.optional xineramaSupport libXinerama;
+    
   passthru = { inherit libtiff libjpeg libpng; };
+
+  meta = {
+    description = "A multi-platform toolkit for creating graphical user interfaces";
+    homepage = http://www.gtk.org/;
+  };
 }

pkgs/development/libraries/gtk-libs/2.12/gtkmm/default.nix

@@ -3,11 +3,10 @@ args: with args;
 stdenv.mkDerivation {
   name = "gtkmm-2.12.7";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.12/gtkmm-2.12.7.tar.bz2;
+    url = mirror://gnome/sources/gtkmm/2.12/gtkmm-2.12.7.tar.bz2;
     sha256 = "1syrn4ppjd0an4ly6vmi388q6aav5fakj39wbcvs4nbphanwjn2f";
   };
 
   buildInputs = [pkgconfig];
   propagatedBuildInputs = [glibmm gtk atk cairomm];
 }
-

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

@@ -1,11 +1,24 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "pango-1.20.2";
+  name = "pango-1.18.4";
+  
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/pango/1.20/pango-1.20.2.tar.bz2;
-    sha256 = "0kjqhlwm43ad8avxz4b8l4w37jjhfilv30ph8sklnqzjj5vz3ayk";
+    url = mirror://gnome/sources/pango/1.18/pango-1.18.4.tar.bz2;
+    sha256 = "1pggwyvklj5pbfwab0dki8nqhph90nq8j4g2rl8d87xanwpcilvg";
   };
+  
   buildInputs = [pkgconfig];
+  
   propagatedBuildInputs = [x11 glib cairo libpng];
+
+  # The configure script doesn't seem to pick up the Cairo cflags.
+  preConfigure = ''
+    CAIRO_CFLAGS=$(pkg-config --cflags cairo --debug)
+  '';
+
+  meta = {
+    description = "A library for laying out and rendering of text, with an emphasis on internationalization";
+    homepage = http://www.pango.org/;
+  };
 }