diff options
author | Andres Löh <mail@andres-loeh.de> | 2011-09-15 05:03:31 +0000 |
---|---|---|
committer | Andres Löh <mail@andres-loeh.de> | 2011-09-15 05:03:31 +0000 |
commit | 54039c51f8f49e4654237651011c5d3cb7cdf679 (patch) | |
tree | 35cbb90234152281de5d1a9791593ffbc936dad7 /pkgs/top-level/haskell-packages.nix | |
parent | 0578ceb11b1b183b3cbda14afcd26f874fa1d6e6 (diff) | |
download | nixpkgs-54039c51f8f49e4654237651011c5d3cb7cdf679.tar nixpkgs-54039c51f8f49e4654237651011c5d3cb7cdf679.tar.gz nixpkgs-54039c51f8f49e4654237651011c5d3cb7cdf679.tar.bz2 nixpkgs-54039c51f8f49e4654237651011c5d3cb7cdf679.tar.lz nixpkgs-54039c51f8f49e4654237651011c5d3cb7cdf679.tar.xz nixpkgs-54039c51f8f49e4654237651011c5d3cb7cdf679.tar.zst nixpkgs-54039c51f8f49e4654237651011c5d3cb7cdf679.zip |
Added haskell-gloss and modified haskell-GLURaw.
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
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6e42881c1f8..2bb3c8f6d94 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -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 {}; |