MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Added haskell-gloss and modified haskell-GLURaw.

Browse source 
I know that GLURaw is currently a modification of the generated file.
Not making the change prevents GLURaw from being loaded into ghci.

svn path=/nixpkgs/trunk/; revision=29290
This commit is contained in:
Andres Löh 2011-09-15 05:03:31 +00:00
parent 0578ceb11b
commit 54039c51f8
3 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/haskell/GLURaw/default.nix
View file

@ -1,11 +1,11 @@
{ cabal, freeglut, OpenGLRaw }:
{ cabal, freeglut, mesa, OpenGLRaw }:
cabal.mkDerivation (self: {
pname = "GLURaw";
version = "1.1.0.0";
sha256 = "03lsskqxh2q7kbnw8hbxz5wp7zq55nwbibsb9maj4y3xpc1vprac";
buildDepends = [ OpenGLRaw ];
extraLibraries = [ freeglut ];
extraLibraries = [ freeglut mesa ];
meta = {
homepage = "http://www.haskell.org/HOpenGL/";
description = "A raw binding for the OpenGL graphics system";

18
pkgs/development/libraries/haskell/gloss/default.nix Normal file
View file

@ -0,0 +1,18 @@
{ cabal, GLUT, OpenGL }:
cabal.mkDerivation (self: {
pname = "gloss";
version = "1.3.4.1";
sha256 = "0cyk75b495vq59pnfqy6ny5kb0i0zq2hwfb1q69vj0cfyiqiwjsb";
buildDepends = [ GLUT OpenGL ];
meta = {
homepage = "http://gloss.ouroborus.net";
description = "Painless 2D vector graphics, animations and simulations";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

7
pkgs/top-level/haskell-packages.nix
View file

@ -606,6 +606,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {};
gloss = callPackage ../development/libraries/haskell/gloss {
GLUT = self.GLUT22;
OpenGL = self.OpenGL24;
};
GLURaw = callPackage ../development/libraries/haskell/GLURaw {};
GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {};
@ -613,6 +618,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
GLUT_2_2_2_0 = callPackage ../development/libraries/haskell/GLUT/2.2.2.0.nix {
OpenGL = self.OpenGL_2_4_0_1;
};
GLUT22 = self.GLUT_2_2_2_0;
GLUT = self.GLUT_2_1_1_2;
gtk = callPackage ../development/libraries/haskell/gtk {
@ -885,6 +891,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix {};
OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {};
OpenGL_2_4_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.1.nix {};
OpenGL24 = self.OpenGL_2_4_0_1;
OpenGL = self.OpenGL_2_2_1_1;
OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {};