From 39ec9d91f4b3bff748377fc5b6dab48fc2bb9923 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:33:04 +0000
Subject: [PATCH] Added new version of wx package for Haskell.

svn path=/nixpkgs/trunk/; revision=15444
---
 .../libraries/haskell/wxHaskell/default.nix   | 22 -------------------
 .../libraries/haskell/wxHaskell/wx.nix        |  5 +++--
 pkgs/top-level/haskell-packages.nix           |  7 ++----
 3 files changed, 5 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/wxHaskell/default.nix

diff --git a/pkgs/development/libraries/haskell/wxHaskell/default.nix b/pkgs/development/libraries/haskell/wxHaskell/default.nix
deleted file mode 100644
index 3a2099f54ce..00000000000
--- a/pkgs/development/libraries/haskell/wxHaskell/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{stdenv, fetchurl, unzip, ghc, wxGTK}:
-
-stdenv.mkDerivation {
-  name = "wxHaskell-0.10.1-pre20070124";
-  
-  src = fetchurl {
-    url = http://nixos.org/tarballs/wxhaskell-src-0.10.1-pre20070124.tar.bz2;
-    sha256 = "1cl0yd3blynjslzz05312bzg1dbymmj8pg88bhnr4p3rqxrlmhx9";
-  };
-  
-  buildInputs = [unzip ghc wxGTK];
-  
-  postInstall = ''
-    make wx
-    make wx-install
-  '';
-
-  meta = {
-    homepage = http://haskell.org/haskellwiki/WxHaskell;
-    description = "A portable and native GUI library for Haskell";
-  };
-}
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
index 4bf21f59147..9d80de70a6b 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix
@@ -1,9 +1,10 @@
-{cabal}:
+{cabal, stm, wxcore}:
 
 cabal.mkDerivation (self : {
   pname = "wx";
   version = "0.11.1.2";
-  sha256 = "68d550067ae190373142c51f3fa14bdf0a1516310aee9a37e28f9ac7cf3b8c6d";
+  sha256 = "d407e191391ec977552932ffbfc86ce7826b56208bbcbc1262d3fc65fe1c2337";
+  propagatedBuildInputs = [stm wxcore];
   meta = {
     description = "wxHaskell";
   };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 43f716bd269..29ceedfff8c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -282,12 +282,9 @@ rec {
     inherit cabal;
   };
 
-  /*
-  wxHaskell = import ../development/libraries/haskell/wxHaskell {
-    inherit ghc;
-    inherit (pkgs) stdenv fetchurl unzip wxGTK;
+  wx = import ../development/libraries/haskell/wxHaskell/wx.nix {
+    inherit cabal stm wxcore;
   };
-  */
 
   wxcore = import ../development/libraries/haskell/wxHaskell/wxcore.nix {
     inherit cabal time parsec stm;