Author: simons
Date: Sun Aug 14 10:44:57 2011
New Revision: 28566
URL: https://svn.nixos.org/websvn/nix/?rev=28566&sc=1
Log:
haskell-GLUT: added version 2.2.2.0
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix Sun Aug
14 10:44:57 2011 (r28566)
@@ -0,0 +1,19 @@
+{ cabal, glut, OpenGL, StateVar, Tensor, libSM, libICE, libXmu, libXi, mesa }:
+
+cabal.mkDerivation (self: {
+ pname = "GLUT";
+ version = "2.2.2.0";
+ sha256 = "0hilpjwkjvpz4sz0zqa36vmx8m1yycjnqdd721mqns7lib2fnzrx";
+ buildDepends = [ OpenGL StateVar Tensor ];
+ extraLibraries = [ glut libSM libICE libXmu libXi mesa ];
+ meta = {
+ homepage = "http://www.haskell.org/HOpenGL/";;
+ description = "A binding for the OpenGL Utility Toolkit";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Aug 14 10:44:53
2011 (r28565)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Aug 14 10:44:57
2011 (r28566)
@@ -611,13 +611,17 @@
inherit (pkgs) mesa;
inherit (pkgs.xlibs) libSM libICE libXmu libXi;
};
-
GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix
{
glut = pkgs.freeglut;
inherit (pkgs) mesa;
inherit (pkgs.xlibs) libSM libICE libXmu libXi;
};
-
+ GLUT_2_2_2_0 = callPackage ../development/libraries/haskell/GLUT/2.2.2.0.nix
{
+ glut = pkgs.freeglut;
+ OpenGL = self.OpenGL_2_4_0_1;
+ inherit (pkgs) mesa;
+ inherit (pkgs.xlibs) libSM libICE libXmu libXi;
+ };
GLUT = self.GLUT_2_1_1_2;
gtk = callPackage ../development/libraries/haskell/gtk {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
