* Getting rid of gtk-libs by moving the packages in gtk-libs to

development/libraries/{glib,gtk+,pango,atk,...}.  Done for glib/gtk+
  1.2.  Also deleted some obsolete, unused versions (gtkLibs 2.10,
  2.12, and 2.14).

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

pkgs/applications/networking/browsers/w3m/default.nix

@@ -1,11 +1,12 @@
 { stdenv, fetchurl
 , sslSupport ? true
 , graphicsSupport ? false
-, ncurses, openssl ? null, boehmgc, gettext, zlib, gdkpixbuf ? null
+, ncurses, openssl ? null, boehmgc, gettext, zlib
+, imlib2 ? null, x11 ? null
 }:
 
 assert sslSupport -> openssl != null;
-assert graphicsSupport -> gdkpixbuf != null;
+assert graphicsSupport -> x11 != null;
 
 stdenv.mkDerivation {
   name = "w3m-0.5.2";
@@ -17,7 +18,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ncurses boehmgc gettext zlib]
     ++ stdenv.lib.optional sslSupport openssl
-    ++ stdenv.lib.optional graphicsSupport gdkpixbuf;
+    ++ stdenv.lib.optionals graphicsSupport [imlib2 x11];
 
   configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}";
 

pkgs/development/libraries/gdk-pixbuf/default.nix

@@ -1,13 +1,10 @@
 {stdenv, fetchurl, gtk, libtiff, libjpeg, libpng}:
 
-assert gtk != null && libtiff != null
+stdenv.mkDerivation rec {
-  && libjpeg != null && libpng != null;
-
-stdenv.mkDerivation {
   name = "gdk-pixbuf-0.22.0";
 
   src = fetchurl {
-    url = ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/0.22/gdk-pixbuf-0.22.0.tar.bz2;
+    url = "ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/0.22/${name}.tar.bz2";
     md5 = "05fcb68ceaa338614ab650c775efc2f2";
   };
 

pkgs/development/libraries/gtk+/1.2.x.nix

@@ -1,17 +1,12 @@
 {stdenv, fetchurl, x11, glib}:
 
-assert x11 != null && glib != null;
-assert x11.buildClientLibs;
-
 stdenv.mkDerivation {
   name = "gtk+-1.2.10";
 
-  builder = ./builder.sh;
   src = fetchurl {
     url = ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz;
     md5 = "4d5cb2fc7fb7830e4af9747a36bfce20";
   };
 
-  buildInputs = [x11 glib];
+  propagatedBuildInputs = [x11 glib];
-  _propagatedBuildInputs = [x11 glib];
 }

pkgs/development/libraries/gtk-libs/1.x/default.nix

@@ -1,17 +0,0 @@
-{stdenv, fetchurl, x11, libtiff, libjpeg, libpng}:
-
-rec {
-
-  glib = (import ./glib) {
-    inherit fetchurl stdenv;
-  };
-
-  gtk = (import ./gtk+) {
-    inherit fetchurl stdenv x11 glib;
-  };
-
-  gdkpixbuf = (import ./gdk-pixbuf) {
-    inherit fetchurl stdenv gtk libtiff libjpeg libpng;
-  };
-
-}

pkgs/development/libraries/gtk-libs/1.x/gtk+/builder.sh

@@ -1,7 +0,0 @@
-source $stdenv/setup
-genericBuild
-
-if test -n "$_propagatedBuildInputs"; then
-    if ! test -x $out/nix-support; then mkdir $out/nix-support; fi
-    echo "$_propagatedBuildInputs" > $out/nix-support/propagated-build-inputs
-fi

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

@@ -1,11 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "atk-1.12.4";
-  src = fetchurl {
-    url = http://ftp.gnome.org/pub/gnome/sources/atk/1.12/atk-1.12.4.tar.bz2;
-    md5 = "0a2c6a7bbc380e3a3d94e9061f76a849";
-  };
-  buildInputs = [pkgconfig perl];
-  propagatedBuildInputs = [glib];
-}

pkgs/development/libraries/gtk-libs/2.10/default.nix

@@ -1,16 +0,0 @@
-args: with args;
-
-rec {
-
-  glib = (import ./glib) args;
-
-  atk = (import ./atk) (args // { inherit glib; });
-
-  pango = (import ./pango) (args // { inherit glib; });
-
-  gtk = (import ./gtk+) (args // { inherit glib atk pango; } );
-
-  glibmm = (import ./glibmm) (args // { inherit glib; });
-
-  gtkmm = (import ./gtkmm) (args // { inherit gtk atk glibmm; });
-}

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

@@ -1,10 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "glib-2.12.13"; # <- sic! gtk 2.10 needs glib 2.12
-  src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/glib/2.12/glib-2.12.13.tar.gz;
-    sha256 = "1aa3jq7l6qv2pm4y0zn9zjnh1sbkynibybmiydghj02c89d3d000";
-  };
-  buildInputs = [pkgconfig gettext perl];
-}

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

@@ -1,13 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "glibmm-2.12.10";
-  src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.12/glibmm-2.12.10.tar.bz2;
-    sha256 = "02rjjdh0f6kafa1sn4y5ykvm4f2qn3yh4kr4lngcv7vzasqn1dr1";
-  };
-
-  buildInputs = [pkgconfig];
-  propagatedBuildInputs = [glib libsigcxx];
-}
-

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

@@ -1,13 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "gtk+-2.10.14";
-  src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-2.10.14.tar.bz2;
-    sha256 = "1qjdx9kdc533dajdy1kv3ssxzh7gz7j7vzgw0ax910q4klil88yh";
-  };
-  buildInputs = [ pkgconfig perl ];
-  propagatedBuildInputs = [x11 glib atk pango libtiff libjpeg libpng cairo
-    libXrandr (if xineramaSupport then libXinerama else null)];
-  passthru = { inherit libtiff libjpeg libpng; };
-}

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

@@ -1,13 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "gtkmm-2.10.11";
-  src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.10/gtkmm-2.10.11.tar.bz2;
-    sha256 = "1bri9r0k69dmi5xgzrlfllp3adfzhz8dh9zkcvi6sjkgfwi594vx";
-  };
-
-  buildInputs = [pkgconfig];
-  propagatedBuildInputs = [glibmm gtk atk cairomm];
-}
-

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

@@ -1,11 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "pango-1.14.10";
-  src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/pango/1.14/pango-1.14.10.tar.bz2;
-    md5 = "e9fc2f8168e74e2fa0aa8238ee0e9c06";
-  };
-  buildInputs = [pkgconfig];
-  propagatedBuildInputs = [x11 glib cairo libpng];
-}

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

@@ -1,11 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "atk-1.20.0";
-  src = fetchurl {
-    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/default.nix

@@ -1,16 +0,0 @@
-args: with args;
-
-rec {
-
-  glib = (import ./glib) args;
-
-  atk = (import ./atk) (args // { inherit glib; });
-
-  pango = (import ./pango) (args // { inherit glib; });
-
-  gtk = (import ./gtk+) (args // { inherit glib atk pango; } );
-
-  glibmm = (import ./glibmm) (args // { inherit glib; });
-
-  gtkmm = (import ./gtkmm) (args // { inherit gtk atk glibmm; });
-}

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

@@ -1,17 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "glib-2.16.3";
-  
-  src = fetchurl {
-    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,12 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "glibmm-2.16.2";
-  src = fetchurl {
-    url = [ mirror://gnome/GNOME/sources/glibmm/2.16/glibmm-2.16.2.tar.bz2 http://ftp.gnome.org/pub/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,23 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "gtk+-2.12.10";
-  
-  src = fetchurl {
-    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
-  ] ++ 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

@@ -1,12 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "gtkmm-2.12.7";
-  src = fetchurl {
-    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,19 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "pango-1.18.4";
-  
-  src = fetchurl {
-    url = mirror://gnome/sources/pango/1.18/pango-1.18.4.tar.bz2;
-    sha256 = "1pggwyvklj5pbfwab0dki8nqhph90nq8j4g2rl8d87xanwpcilvg";
-  };
-  
-  buildInputs = [pkgconfig];
-  
-  propagatedBuildInputs = [x11 glib cairo libpng];
-
-  meta = {
-    description = "A library for laying out and rendering of text, with an emphasis on internationalization";
-    homepage = http://www.pango.org/;
-  };
-}

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

@@ -1,30 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation rec {
-  name = "atk-1.24.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/atk/1.24/${name}.tar.bz2";
-    sha256 = "0mjxliarzcy7iksh6v1npxsqdpc9sjj3q4wcl567asbdzdpbd803";
-  };
-
-  buildInputs = [pkgconfig perl];
-  propagatedBuildInputs = [glib];
-
-  meta = {
-    description = "ATK, the accessibility toolkit";
-
-    longDescription = ''
-      ATK is the Accessibility Toolkit.  It provides a set of generic
-      interfaces allowing accessibility technologies such as screen
-      readers to interact with a graphical user interface.  Using the
-      ATK interfaces, accessibility tools have full access to view and
-      control running applications.
-    '';
-
-    homepage = http://library.gnome.org/devel/atk/;
-
-    license = "LGPLv2+";
-  };
-
-}

pkgs/development/libraries/gtk-libs/2.14/default.nix

@@ -1,20 +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+) (args // {
-    inherit glib atk pango;
-  });
-
-  glibmm = (import ./glibmm) (args // { inherit glib; });
-
-  pangomm = (import ./pangomm) (args // { inherit pango glibmm cairomm; });
-
-  gtkmm = (import ./gtkmm) (args // { inherit gtk atk glibmm pangomm; });
-}

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

@@ -1,27 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation rec {
-  name = "glib-2.18.4";
-  
-  src = fetchurl {
-    url = "mirror://gnome/sources/glib/2.18/${name}.tar.bz2";
-    sha256 = "00711nscyya6j1kdda7sbxy01qspccpvmnmc8f4kip4zbs22rsva";
-  };
-  
-  buildInputs = [pkgconfig gettext perl];
-
-  meta = {
-    description = "GLib, a C library of programming buildings blocks";
-
-    longDescription = ''
-      GLib provides the core application building blocks for libraries
-      and applications written in C.  It provides the core object
-      system used in GNOME, the main loop implementation, and a large
-      set of utility functions for strings and common data structures.
-    '';
-
-    homepage = http://www.gtk.org/;
-
-    license = "LGPLv2+";
-  };
-}

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

@@ -1,21 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation rec {
-  name = "glibmm-2.18.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/glibmm/2.18/${name}.tar.bz2";
-    sha256 = "0jg65hv6pwxqk4fabsjjz2zwn5hb6rgy3szj956avliarbliyr3r";
-  };
-
-  buildInputs = [pkgconfig];
-  propagatedBuildInputs = [glib libsigcxx];
-
-  meta = {
-    description = "C++ interface to the GLib library";
-
-    homepage = http://gtkmm.org/;
-
-    license = "LGPLv2+";
-  };
-}

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

@@ -1,37 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation rec {
-  name = "gtk+-2.14.7";
-  
-  src = fetchurl {
-    url = "mirror://gnome/sources/gtk+/2.14/${name}.tar.bz2";
-    sha256 = "053yn2fdxhqd4jhds4j96daw2zd4cfw5wx9vf4szrfidwll4fbz8";
-  };
-  
-  buildInputs = [ pkgconfig perl jasper ];
-  
-  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";
-
-    longDescription = ''
-      GTK+ is a highly usable, feature rich toolkit for creating
-      graphical user interfaces which boasts cross platform
-      compatibility and an easy to use API.  GTK+ it is written in C,
-      but has bindings to many other popular programming languages
-      such as C++, Python and C# among others.  GTK+ is licensed
-      under the GNU LGPL 2.1 allowing development of both free and
-      proprietary software with GTK+ without any license fees or
-      royalties.
-    '';
-
-    homepage = http://www.gtk.org/;
-
-    license = "LGPLv2+";
-  };
-}

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

@@ -1,31 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation rec {
-  name = "gtkmm-2.14.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gtkmm/2.14/${name}.tar.bz2";
-    sha256 = "18jral2lv9jv02d3balh0mi0wgbqhrz5y2laclri1skccc2q3c94";
-  };
-
-  buildInputs = [pkgconfig];
-  propagatedBuildInputs = [ glibmm gtk atk cairomm pangomm ];
-
-  meta = {
-    description = "C++ interface to the GTK+ graphical user interface library";
-
-    longDescription = ''
-      gtkmm is the official C++ interface for the popular GUI library
-      GTK+.  Highlights include typesafe callbacks, and a
-      comprehensive set of widgets that are easily extensible via
-      inheritance.  You can create user interfaces either in code or
-      with the Glade User Interface designer, using libglademm.
-      There's extensive documentation, including API reference and a
-      tutorial.
-    '';
-
-    homepage = http://gtkmm.org/;
-
-    license = "LGPLv2+";
-  };
-}

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

@@ -1,29 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation rec {
-  name = "pango-1.22.4";
-  
-  src = fetchurl {
-    url = "mirror://gnome/sources/pango/1.22/${name}.tar.bz2";
-    sha256 = "0d55x97c78rmcsls5g236xwwhjq1bvscrlxqligyzsv0hgnxfizz";
-  };
-  
-  buildInputs = [pkgconfig];
-  
-  propagatedBuildInputs = [x11 glib cairo libpng];
-
-  meta = {
-    description = "A library for laying out and rendering of text, with an emphasis on internationalization";
-
-    longDescription = ''
-      Pango is a library for laying out and rendering of text, with an
-      emphasis on internationalization.  Pango can be used anywhere
-      that text layout is needed, though most of the work on Pango so
-      far has been done in the context of the GTK+ widget toolkit.
-      Pango forms the core of text and font handling for GTK+-2.x.
-    '';
-
-    homepage = http://www.pango.org/;
-    license = "LGPLv2+";
-  };
-}

pkgs/development/libraries/gtk-libs/2.14/pangomm/default.nix

@@ -1,28 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation rec {
-  name ="pangomm-2.14.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/pangomm/2.14/${name}.tar.bz2";
-    sha256 = "0mrm5hv8kb84qzb97lqbipzzc8g0b97pfgz2hqq33xs2ha3lswnp";
-  };
-
-  buildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ pango glibmm cairomm libpng ];
-
-  meta = {
-    description = "C++ interface to the Pango text rendering library";
-
-    longDescription = ''
-      Pango is a library for laying out and rendering of text, with an
-      emphasis on internationalization.  Pango can be used anywhere
-      that text layout is needed, though most of the work on Pango so
-      far has been done in the context of the GTK+ widget toolkit.
-      Pango forms the core of text and font handling for GTK+-2.x.
-    '';
-
-    homepage = http://www.pango.org/;
-    license = "LGPLv2+";
-  };
-}

pkgs/top-level/all-packages.nix

@@ -3387,6 +3387,11 @@ let
     inherit fetchurl stdenv;
   };
 
+  gdk_pixbuf = import ../development/libraries/gdk-pixbuf {
+    inherit fetchurl stdenv libtiff libjpeg libpng;
+    inherit (gtkLibs1x) gtk;
+  };
+
   gegl = import ../development/libraries/gegl {
     inherit fetchurl stdenv libpng pkgconfig babl;
     openexr = openexr_1_6_1;
@@ -3558,29 +3563,16 @@ let
 
   gtkLibs = recurseIntoAttrs gtkLibs216;
 
-  gtkLibs1x = import ../development/libraries/gtk-libs/1.x {
+  gtkLibs1x = rec {
-    inherit fetchurl stdenv x11 libtiff libjpeg libpng;
-  };
 
-  gtkLibs210 = import ../development/libraries/gtk-libs/2.10 {
+    glib = import ../development/libraries/glib/1.2.x.nix {
-    inherit fetchurl stdenv pkgconfig gettext perl x11
+      inherit fetchurl stdenv;
-            libtiff libjpeg libpng cairo libsigcxx cairomm;
+    };
-    inherit (xlibs) libXinerama libXrandr;
-    xineramaSupport = true;
-  };
 
-  gtkLibs212 = import ../development/libraries/gtk-libs/2.12 {
+    gtk = import ../development/libraries/gtk+/1.2.x.nix {
-    inherit fetchurl stdenv pkgconfig gettext perl x11
+      inherit fetchurl stdenv x11 glib;
-            libtiff libjpeg libpng cairo libsigcxx cairomm;
+    };
-    inherit (xlibs) libXinerama libXrandr;
+  
-    xineramaSupport = true;
-  };
-
-  gtkLibs214 = import ../development/libraries/gtk-libs/2.14 {
-    inherit fetchurl stdenv pkgconfig gettext perl x11 jasper
-            libtiff libjpeg libpng cairo libsigcxx cairomm;
-    inherit (xlibs) libXinerama libXrandr;
-    xineramaSupport = true;
   };
 
   gtkLibs216 = import ../development/libraries/gtk-libs/2.16 {
@@ -7909,9 +7901,8 @@ let
   };
 
   w3m = import ../applications/networking/browsers/w3m {
-    inherit fetchurl stdenv ncurses openssl boehmgc gettext zlib;
+    inherit fetchurl stdenv ncurses openssl boehmgc gettext zlib imlib2 x11;
     graphicsSupport = false;
-    inherit (gtkLibs1x) gdkpixbuf;
   };
 
   # I'm keen on wmiimenu only  >wmii-3.5 no longer has it...