From f9d9a0c4ca6a0ac2630d49a1dd4f1cc4ac3131e7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Jul 2012 16:43:47 +0200
Subject: [PATCH] gtkglextmm: add version 1.2.0

Patch submitted by Jan Malakhovski <oxij@oxij.org>.
---
 pkgs/desktops/gnome-2/default.nix             |  2 ++
 .../gnome-2/platform/gtkglextmm/default.nix   | 25 +++++++++++++++++++
 .../gnome-2/platform/gtkglextmm/gdk.patch     | 15 +++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
 create mode 100644 pkgs/desktops/gnome-2/platform/gtkglextmm/gdk.patch

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index d6d55273efd..943dbc9a500 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -69,6 +69,8 @@
 
   gtkglext = callPackage ./platform/gtkglext { };
 
+  gtkglextmm = callPackage ./platform/gtkglextmm { };
+
 #### DESKTOP
 
   gnome_keyring = callPackage ./desktop/gnome-keyring { };
diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
new file mode 100644
index 00000000000..38b816ccc77
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl_gnome, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+  name = src.pkgname;
+
+  src = fetchurl_gnome {
+    project = "gtkglextmm";
+    major = "1"; minor = "2"; patchlevel = "0"; extension = "bz2";
+    sha256 = "6cd4bd2a240e5eb1e3a24c5a3ebbf7ed905b522b888439778043fdeb58771fea";
+  };
+
+  patches = [ ./gdk.patch ];
+
+  buildNativeInputs = [pkgconfig];
+
+  propagatedBuildInputs = [ gtkglext gtkmm gtk mesa gdk_pixbuf ];
+
+  meta = {
+    description = "C++ wrappers for GtkGLExt";
+
+    license = "LGPLv2+";
+
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/gdk.patch b/pkgs/desktops/gnome-2/platform/gtkglextmm/gdk.patch
new file mode 100644
index 00000000000..8a39b521d63
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/gdk.patch
@@ -0,0 +1,15 @@
+# fixes: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=621976
+# reference: http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg250570.html
+--- gtkglextmm-1.2.0-orig/gtkglext/gtkmm/gl/widget.cc	2004-05-18 03:01:50.000000000 -0300
++++ gtkglextmm-1.2.0/gtkglext/gtkmm/gl/widget.cc	2011-06-12 17:57:13.075541070 -0300
+@@ -17,9 +17,8 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
+  */
+ 
+-#include <gtk/gtkglwidget.h>
+-
+ #include "widget.h"
++#include <gtk/gtkglwidget.h>
+ 
+ namespace Gtk
+ {
\ No newline at end of file