From e0eb3828bcd763e610c23aef9a7e26e6eb619f3d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Oct 2005 11:57:24 +0000
Subject: [PATCH] * Added the Cairo graphics library. * Updated GTK and friends
 to 2.8.x.

svn path=/nixpkgs/trunk/; revision=4073
---
 .../libraries/gtk-libs-2.8/atk/default.nix    | 13 ++++++++++
 .../libraries/gtk-libs-2.8/default.nix        | 24 +++++++++++++++++++
 .../libraries/gtk-libs-2.8/glib/default.nix   | 12 ++++++++++
 .../libraries/gtk-libs-2.8/glibmm/default.nix | 12 ++++++++++
 .../libraries/gtk-libs-2.8/gtk+/default.nix   | 19 +++++++++++++++
 .../libraries/gtk-libs-2.8/gtkmm/default.nix  | 12 ++++++++++
 .../libraries/gtk-libs-2.8/pango/default.nix  | 13 ++++++++++
 pkgs/system/all-packages-generic.nix          | 12 +++++++++-
 8 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/gtk-libs-2.8/atk/default.nix
 create mode 100644 pkgs/development/libraries/gtk-libs-2.8/default.nix
 create mode 100644 pkgs/development/libraries/gtk-libs-2.8/glib/default.nix
 create mode 100644 pkgs/development/libraries/gtk-libs-2.8/glibmm/default.nix
 create mode 100644 pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix
 create mode 100644 pkgs/development/libraries/gtk-libs-2.8/gtkmm/default.nix
 create mode 100644 pkgs/development/libraries/gtk-libs-2.8/pango/default.nix

diff --git a/pkgs/development/libraries/gtk-libs-2.8/atk/default.nix b/pkgs/development/libraries/gtk-libs-2.8/atk/default.nix
new file mode 100644
index 000000000000..a52622891ca2
--- /dev/null
+++ b/pkgs/development/libraries/gtk-libs-2.8/atk/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, pkgconfig, glib, perl}:
+
+assert pkgconfig != null && glib != null && perl != null;
+
+stdenv.mkDerivation {
+  name = "atk-1.10.1";
+  src = fetchurl {
+    url = ftp://ftp.gtk.org/pub/gtk/v2.8/atk-1.10.1.tar.bz2;
+    md5 = "29df8fe9016083e7eaf129bdd65d8402";
+  };
+  buildInputs = [pkgconfig perl];
+  propagatedBuildInputs = [glib];
+}
diff --git a/pkgs/development/libraries/gtk-libs-2.8/default.nix b/pkgs/development/libraries/gtk-libs-2.8/default.nix
new file mode 100644
index 000000000000..d7e0b2673dde
--- /dev/null
+++ b/pkgs/development/libraries/gtk-libs-2.8/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gettext, perl, x11
+, libtiff, libjpeg, libpng, cairo
+}:
+
+rec {
+
+  glib = (import ./glib) {
+    inherit fetchurl stdenv pkgconfig gettext perl;
+  };
+
+  atk = (import ./atk) {
+    inherit fetchurl stdenv pkgconfig glib perl;
+  };
+
+  pango = (import ./pango) {
+    inherit fetchurl stdenv pkgconfig glib x11 cairo;
+  };
+
+  gtk = (import ./gtk+) {
+    inherit fetchurl stdenv pkgconfig glib atk pango perl
+            libtiff libjpeg libpng x11 cairo;
+  };
+
+}
diff --git a/pkgs/development/libraries/gtk-libs-2.8/glib/default.nix b/pkgs/development/libraries/gtk-libs-2.8/glib/default.nix
new file mode 100644
index 000000000000..0d7996f839c7
--- /dev/null
+++ b/pkgs/development/libraries/gtk-libs-2.8/glib/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, pkgconfig, gettext, perl}:
+
+assert pkgconfig != null && gettext != null && perl != null;
+
+stdenv.mkDerivation {
+  name = "glib-2.8.3";
+  src = fetchurl {
+    url = ftp://ftp.gtk.org/pub/gtk/v2.8/glib-2.8.3.tar.bz2;
+    md5 = "58177fe64c189b86bac1625350512159";
+  };
+  buildInputs = [pkgconfig gettext perl];
+}
diff --git a/pkgs/development/libraries/gtk-libs-2.8/glibmm/default.nix b/pkgs/development/libraries/gtk-libs-2.8/glibmm/default.nix
new file mode 100644
index 000000000000..957c596fc7b1
--- /dev/null
+++ b/pkgs/development/libraries/gtk-libs-2.8/glibmm/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, pkgconfig, glib, libsigcxx}:
+
+stdenv.mkDerivation {
+  name = "glibmm-2.6.4";
+  src = fetchurl {
+    url = http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.6/glibmm-2.6.1.tar.bz2;
+    md5 = "e37da352bf581503c5866f0231fd4a74";
+  };
+
+  buildInputs = [pkgconfig glib libsigcxx];
+}
+
diff --git a/pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix
new file mode 100644
index 000000000000..6b066f3437e1
--- /dev/null
+++ b/pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, x11, glib, atk
+, pango, perl, libtiff, libjpeg, libpng, cairo
+}:
+
+assert pkgconfig != null && x11 != null && glib != null && atk != null
+  && pango != null && perl != null && perl != null && libtiff != null
+  && libjpeg != null && libpng != null;
+assert x11.buildClientLibs;
+
+stdenv.mkDerivation {
+  name = "gtk+-2.8.6";
+  src = fetchurl {
+    url = ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-2.8.6.tar.bz2;
+    md5 = "2bcb9e3feb62ac895101cb8ee87ca49a";
+  };
+  buildInputs = [pkgconfig perl libtiff libjpeg libpng cairo];
+  propagatedBuildInputs = [x11 glib atk pango];
+  inherit libtiff libjpeg libpng;
+}
diff --git a/pkgs/development/libraries/gtk-libs-2.8/gtkmm/default.nix b/pkgs/development/libraries/gtk-libs-2.8/gtkmm/default.nix
new file mode 100644
index 000000000000..ebc1e881c471
--- /dev/null
+++ b/pkgs/development/libraries/gtk-libs-2.8/gtkmm/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, pkgconfig, gtk, atk, glibmm, libsigcxx}:
+
+stdenv.mkDerivation {
+  name = "gtkmm-2.6.4";
+  src = fetchurl {
+    url = http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.6/gtkmm-2.6.4.tar.bz2;
+    md5 = "f71d1c4a89c4f9e054400f12a82dec5f";
+  };
+
+  buildInputs = [pkgconfig gtk atk glibmm libsigcxx];
+}
+
diff --git a/pkgs/development/libraries/gtk-libs-2.8/pango/default.nix b/pkgs/development/libraries/gtk-libs-2.8/pango/default.nix
new file mode 100644
index 000000000000..9f850df036c2
--- /dev/null
+++ b/pkgs/development/libraries/gtk-libs-2.8/pango/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, pkgconfig, x11, glib, cairo}:
+
+assert x11.buildClientLibs;
+
+stdenv.mkDerivation {
+  name = "pango-1.10.1";
+  src = fetchurl {
+    url = ftp://ftp.gtk.org/pub/gtk/v2.8/pango-1.10.1.tar.bz2;
+    md5 = "1ff4c96982f61ea6f390d09a4febdf18";
+  };
+  buildInputs = [pkgconfig];
+  propagatedBuildInputs = [x11 glib cairo];
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 14fbbb5eae18..bb41b4834101 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -785,7 +785,17 @@ rec {
     inherit fetchurl stdenv gettext;
   };
 
-  gtkLibs = gtkLibs26;
+  cairo = (import ../development/libraries/cairo) {
+    inherit fetchurl stdenv pkgconfig x11 freetype zlib libpng;
+    inherit (xlibs) fontconfig;
+  };
+
+  gtkLibs = gtkLibs28;
+
+  gtkLibs28 = import ../development/libraries/gtk-libs-2.8 {
+    inherit fetchurl stdenv pkgconfig gettext perl x11
+            libtiff libjpeg libpng cairo;
+  };
 
   gtkLibs26 = import ../development/libraries/gtk-libs-2.6 {
     inherit fetchurl stdenv pkgconfig gettext perl x11