Added new version of wx package for Haskell.

svn path=/nixpkgs/trunk/; revision=15444
This commit is contained in:
Andres Löh 2009-05-04 13:33:04 +00:00
parent 393286fd47
commit 39ec9d91f4
3 changed files with 5 additions and 29 deletions

View File

@ -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";
};
}

View File

@ -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";
};

View File

@ -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;