Updating wxHaskell (in progress).

svn path=/nixpkgs/trunk/; revision=15442
This commit is contained in:
Andres Löh 2009-05-04 13:32:59 +00:00
parent ab6c19e6a3
commit 9a216af770
3 changed files with 37 additions and 0 deletions

View file

@ -0,0 +1,11 @@
{cabal}:
cabal.mkDerivation (self : {
pname = "wx";
version = "0.11.1.2";
sha256 = "68d550067ae190373142c51f3fa14bdf0a1516310aee9a37e28f9ac7cf3b8c6d";
meta = {
description = "wxHaskell";
};
})

View file

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

View file

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