* Don't use another instance of GTK - 4 is enough already ;-)

* libbonobui needs gettext for libintl.h header goodness.

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

pkgs/development/libraries/gnome/atk/default.nix

@@ -1,9 +0,0 @@
-{input, stdenv, fetchurl, pkgconfig, glib, perl}:
-
-assert pkgconfig != null && glib != null && perl != null;
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-  buildInputs = [pkgconfig perl];
-  propagatedBuildInputs = [glib];
-}

pkgs/development/libraries/gnome/default.nix

@@ -3,7 +3,7 @@
 { stdenv, fetchurl, pkgconfig, audiofile
 , flex, bison, popt, perl, zlib, libxml2, bzip2
 , perlXMLParser, gettext, x11, libtiff, libjpeg
-, libpng
+, libpng, gtkLibs
 }:
 
 rec {
@@ -14,26 +14,13 @@ rec {
     inherit stdenv fetchurl;
   };
 
-  glib = (import ./glib) {
+  glib = gtkLibs.glib;
-    inherit fetchurl stdenv pkgconfig gettext perl;
-    input = platform.glib;
-  };
 
-  atk = (import ./atk) {
+  atk = gtkLibs.atk;
-    inherit fetchurl stdenv pkgconfig glib perl;
-    input = platform.atk;
-  };
 
-  pango = (import ./pango) {
+  pango = gtkLibs.pango;
-    inherit fetchurl stdenv pkgconfig glib x11;
-    input = platform.pango;
-  };
 
-  gtk = (import ./gtk+) {
+  gtk = gtkLibs.gtk;
-    inherit fetchurl stdenv pkgconfig glib atk pango perl
-            libtiff libjpeg libpng x11;
-    input = platform.gtk;
-  };
 
   esound = (import ./esound) {
     inherit fetchurl stdenv audiofile;
@@ -118,7 +105,7 @@ rec {
 
   libbonoboui = (import ./libbonoboui) {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 libglade
-            libgnome libgnomecanvas;
+            libgnome libgnomecanvas gettext;
     input = platform.libbonoboui;
   };
 

pkgs/development/libraries/gnome/glib/default.nix

@@ -1,8 +0,0 @@
-{input, stdenv, fetchurl, pkgconfig, gettext, perl}:
-
-assert pkgconfig != null && gettext != null && perl != null;
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-  buildInputs = [pkgconfig gettext perl];
-}

pkgs/development/libraries/gnome/gtk+/default.nix

@@ -1,17 +0,0 @@
-{input, stdenv, fetchurl, pkgconfig, x11, glib, atk
-, pango, perl, libtiff, libjpeg, libpng}:
-
-assert pkgconfig != null && x11 != null && glib != null && atk != null
-  && pango != null && perl != null && perl != null && libtiff != null
-  && libjpeg != null && libpng != null;
-assert x11.buildClientLibs;
-#assert glib == atk.glib;
-#assert glib == pango.glib;
-#assert x11 == pango.x11;
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-  buildInputs = [pkgconfig perl libtiff libjpeg libpng];
-  propagatedBuildInputs = [x11 glib atk pango];
-  inherit libtiff libjpeg libpng;
-}

pkgs/development/libraries/gnome/libbonoboui/default.nix

@@ -1,5 +1,5 @@
 { input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libglade, libgnome
-, libgnomecanvas}:
+, libgnomecanvas, gettext}:
 
 assert pkgconfig != null && perl != null && libxml2 != null
   && libglade != null && libgnome != null && libgnomecanvas != null;
@@ -7,7 +7,7 @@ assert pkgconfig != null && perl != null && libxml2 != null
 # todo 2.8.1 doesn;t work
 stdenv.mkDerivation {
   inherit (input) name src;
-  buildInputs = [pkgconfig perl libglade];
+  buildInputs = [pkgconfig perl libglade gettext];
   propagatedBuildInputs = [libxml2 libgnome libgnomecanvas];
 
   PERL5LIB = perlXMLParser ~ "/lib/site_perl";

pkgs/development/libraries/gnome/pango/default.nix

@@ -1,10 +0,0 @@
-{input, stdenv, fetchurl, pkgconfig, x11, glib}:
-
-assert pkgconfig != null && x11 != null && glib != null;
-assert x11.buildClientLibs;
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-  buildInputs = [pkgconfig];
-  propagatedBuildInputs = [x11 glib];
-}