* Finished getting rid of gtk-libs.

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

9 files changed, 46 insertions, 43 deletions

diff --git a/pkgs/development/libraries/gtk-libs/2.18/atk/default.nix b/pkgs/development/libraries/atk/1.28.x.nix
index 34278f64159b8..753f8c59c8787 100644
--- a/pkgs/development/libraries/gtk-libs/2.18/atk/default.nix
+++ b/pkgs/development/libraries/atk/1.28.x.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, perl, glib }:
 
 stdenv.mkDerivation rec {
   name = "atk-1.28.0";
diff --git a/pkgs/development/libraries/gtk-libs/2.18/glib/default.nix b/pkgs/development/libraries/glib/2.22.x.nix
index 852afc0d943fb..b1965f1915f0a 100644
--- a/pkgs/development/libraries/gtk-libs/2.18/glib/default.nix
+++ b/pkgs/development/libraries/glib/2.22.x.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, gettext, perl }:
 
 stdenv.mkDerivation rec {
   name = "glib-2.22.2";
diff --git a/pkgs/development/libraries/gtk-libs/2.18/glibmm/default.nix b/pkgs/development/libraries/glibmm/2.22.x.nix
index db3aadb2b8c44..10b8ad8d39193 100644
--- a/pkgs/development/libraries/gtk-libs/2.18/glibmm/default.nix
+++ b/pkgs/development/libraries/glibmm/2.22.x.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }:
 
 stdenv.mkDerivation rec {
   name = "glibmm-2.22.1";
diff --git a/pkgs/development/libraries/gtk-libs/2.18/gtk+/default.nix b/pkgs/development/libraries/gtk+/2.18.x.nix
index 3a47c9d73e1f8..fd5c290838418 100644
--- a/pkgs/development/libraries/gtk-libs/2.18/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk+/2.18.x.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, pkgconfig, x11, glib, atk, pango, libtiff, libjpeg
-, libpng, cairo, libXrandr, perl, jasper
-, xineramaSupport ? true, libXinerama ? null
+{ stdenv, fetchurl, pkgconfig, glib, atk, pango, libtiff, libjpeg
+, libpng, cairo, perl, jasper, xlibs
+, xineramaSupport ? true
 , cupsSupport ? true, cups ? null, openssl ? null
 }:
 
-assert xineramaSupport -> libXinerama != null;
+assert xineramaSupport -> xlibs.libXinerama != null;
 assert cupsSupport -> cups != null && openssl != null;
 
 stdenv.mkDerivation rec {
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig perl jasper ];
   
   propagatedBuildInputs =
-    [ x11 glib atk pango libtiff libjpeg libpng cairo libXrandr ]
-    ++ stdenv.lib.optional xineramaSupport libXinerama
+    [ xlibs.xlibs glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr ]
+    ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
     ++ stdenv.lib.optionals cupsSupport [ cups openssl ];
 
   passthru = { inherit libtiff libjpeg libpng; };
diff --git a/pkgs/development/libraries/gtk-libs/2.18/default.nix b/pkgs/development/libraries/gtk-libs/2.18/default.nix
deleted file mode 100644
index c31203857ed00..0000000000000
--- a/pkgs/development/libraries/gtk-libs/2.18/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-args: with args;
-
-rec {
-
-  glib = (import ./glib) args;
-
-  atk = (import ./atk) (args // { inherit glib; });
-
-  pango = (import ./pango) (args // { inherit glib cairo; });
-
-  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; });
-
-  pangomm = (import ./pangomm) (args // { inherit pango glibmm cairomm; });
-
-  gtkmm = (import ./gtkmm) (args // { inherit gtk atk glibmm pangomm; });
-}
diff --git a/pkgs/development/libraries/gtk-libs/2.18/gtkmm/default.nix b/pkgs/development/libraries/gtkmm/2.18.x.nix
index a31cabd8a9686..63644a1736020 100644
--- a/pkgs/development/libraries/gtk-libs/2.18/gtkmm/default.nix
+++ b/pkgs/development/libraries/gtkmm/2.18.x.nix
@@ -1,11 +1,11 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, gtk, atk, glibmm, cairomm, pangomm }:
 
 stdenv.mkDerivation rec {
-  name = "gtkmm-2.18.1";
+  name = "gtkmm-2.18.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtkmm/2.18/${name}.tar.bz2";
-    sha256 = "09d66g7i6acfy5gijml54kw5gvynmrq04zl02x2k9aixpa9xybql";
+    sha256 = "0kj71db6qwgybmrs0myaz6hfz1zdfzh286vkmv5ldh6d5vi07h6z";
   };
 
   buildInputs = [pkgconfig];
diff --git a/pkgs/development/libraries/gtk-libs/2.18/pango/default.nix b/pkgs/development/libraries/pango/1.26.x.nix
index 8684b82bd0b60..7efca117cba8c 100644
--- a/pkgs/development/libraries/gtk-libs/2.18/pango/default.nix
+++ b/pkgs/development/libraries/pango/1.26.x.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
 
 stdenv.mkDerivation rec {
   name = "pango-1.26.0";
diff --git a/pkgs/development/libraries/gtk-libs/2.18/pangomm/default.nix b/pkgs/development/libraries/pangomm/2.26.x.nix
index 4e40f1034599e..ce1c5207e3265 100644
--- a/pkgs/development/libraries/gtk-libs/2.18/pangomm/default.nix
+++ b/pkgs/development/libraries/pangomm/2.26.x.nix
@@ -1,7 +1,7 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng }:
 
 stdenv.mkDerivation rec {
-  name ="pangomm-2.26.0";
+  name = "pangomm-2.26.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/pangomm/2.26/${name}.tar.bz2";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e14e0e598940e..8482e6c51930d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3614,12 +3614,37 @@ let
   
   };
 
-  gtkLibs218 = import ../development/libraries/gtk-libs/2.18 {
-    inherit fetchurl stdenv pkgconfig gettext perl x11 jasper
-            libtiff libjpeg libpng cairo libsigcxx cairomm cups
-            openssl;
-    inherit (xlibs) libXinerama libXrandr;
-    xineramaSupport = true;
+  gtkLibs218 = rec {
+
+    glib = import ../development/libraries/glib/2.22.x.nix {
+      inherit fetchurl stdenv pkgconfig gettext perl;
+    };
+
+    glibmm = import ../development/libraries/glibmm/2.22.x.nix {
+      inherit fetchurl stdenv pkgconfig glib libsigcxx;
+    };
+
+    atk = import ../development/libraries/atk/1.28.x.nix {
+      inherit fetchurl stdenv pkgconfig perl glib;
+    };
+
+    pango = import ../development/libraries/pango/1.26.x.nix {
+      inherit fetchurl stdenv pkgconfig gettext x11 glib cairo libpng;
+    };
+
+    pangomm = import ../development/libraries/pangomm/2.26.x.nix {
+      inherit fetchurl stdenv pkgconfig pango glibmm cairomm libpng;
+    };
+
+    gtk = import ../development/libraries/gtk+/2.18.x.nix {
+      inherit fetchurl stdenv pkgconfig perl jasper glib atk pango
+        libtiff libjpeg libpng cairo xlibs cups openssl;
+    };
+  
+    gtkmm = import ../development/libraries/gtkmm/2.18.x.nix {
+      inherit fetchurl stdenv pkgconfig gtk atk glibmm cairomm pangomm;
+    };
+  
   };
 
   gtkmozembedsharp = import ../development/libraries/gtkmozembed-sharp {