From 9a216af770abb9c44ff4aadc96a3eea040cd7c36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Mon, 4 May 2009 13:32:59 +0000
Subject: [PATCH] Updating wxHaskell (in progress).

svn path=/nixpkgs/trunk/; revision=15442
---
 .../libraries/haskell/wxHaskell/wx.nix          | 11 +++++++++++
 .../libraries/haskell/wxHaskell/wxcore.nix      | 17 +++++++++++++++++
 pkgs/top-level/haskell-packages.nix             |  9 +++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/wxHaskell/wx.nix
 create mode 100644 pkgs/development/libraries/haskell/wxHaskell/wxcore.nix

diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
new file mode 100644
index 000000000000..4bf21f59147d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "wx";
+  version = "0.11.1.2";
+  sha256 = "68d550067ae190373142c51f3fa14bdf0a1516310aee9a37e28f9ac7cf3b8c6d";
+  meta = {
+    description = "wxHaskell";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
new file mode 100644
index 000000000000..ecca8a152de7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
@@ -0,0 +1,17 @@
+{cabal, time, parsec, stm, libX11, mesa, wxGTK}:
+
+cabal.mkDerivation (self : {
+  pname = "wxcore";
+  version = "0.11.1.2";
+  sha256 = "b91b17243d8a08d96f572224c434c36d14feb1b0bb64a0e63900f0103a7c4752";
+  propagatedBuildInputs = [time parsec stm libX11 wxGTK mesa];
+  /* configureFlags = [ "--with-opengl" ]; */
+  preConfigure = ''
+    sed -i 's/ghc-pkg latest/ghc-pkg --global latest/g' configure
+    sed -i 's/pkg describe/pkg --global describe/g' configure
+  '';
+  meta = {
+    description = "wxHaskell core";
+  };
+})  
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1c6fb17aea47..f56f92e8621b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -278,10 +278,19 @@ rec {
     inherit cabal;
   };
 
+  /*
   wxHaskell = import ../development/libraries/haskell/wxHaskell {
     inherit ghc;
     inherit (pkgs) stdenv fetchurl unzip wxGTK;
   };
+  */
+
+  wxcore = import ../development/libraries/haskell/wxHaskell/wxcore.nix {
+    inherit cabal time parsec stm;
+    wxGTK = pkgs.wxGTK28;
+    inherit (pkgs) mesa;
+    inherit (pkgs.xlibs) libX11;
+  };
 
   X11 = import ../development/libraries/haskell/X11 {
     inherit cabal;