mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 15:33:13 +00:00
haskell-GLUT: patch version 2.3.0.0 to build with GHC 7.6.1
This commit is contained in:
parent
097e1bfdbd
commit
e6d0852c2c
@ -1,5 +1,5 @@
|
||||
{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
|
||||
, OpenGLRaw, StateVar, Tensor
|
||||
, OpenGLRaw, StateVar, Tensor, fetchurl
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
@ -8,6 +8,10 @@ cabal.mkDerivation (self: {
|
||||
sha256 = "10rh57w3lx8fs0xy24lqilv5a5sgq57kshydja41r6fq9wdvwp99";
|
||||
buildDepends = [ OpenGL OpenGLRaw StateVar Tensor ];
|
||||
extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
|
||||
patches = [
|
||||
(fetchurl { url = "https://github.com/haskell-opengl/GLUT/commit/e962ebb7bed7e61e4591ae67f86199d557c7d54c.patch"; sha256 = "0s9xrkz1pkbkhsjzwbj4ayynmvzp5cckkl2lrizcjwcnqv83srmq"; })
|
||||
(fetchurl { url = "https://github.com/haskell-opengl/GLUT/commit/fced812bc726c208064a2c48e411f4d609444abc.patch"; sha256 = "1kc7ic70lq43v8ikbcgbs5f2l4wzaz9vylhkmp38q26zs6qzbv07"; })
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://www.haskell.org/haskellwiki/Opengl";
|
||||
description = "A binding for the OpenGL Utility Toolkit";
|
||||
|
@ -122,7 +122,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
inherit (self) cabal ghc;
|
||||
cgi = self.cgi_3001_1_8_3; # 7.6 ok
|
||||
fgl = self.fgl_5_4_2_4; # 7.6 ok
|
||||
GLUT = self.GLUT_2_3_0_0; # 7.6 fail
|
||||
GLUT = self.GLUT_2_3_0_0; # 7.6 ok
|
||||
haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 fail
|
||||
html = self.html_1_0_1_2; # 7.6 ok
|
||||
HTTP = self.HTTP_4000_2_4; # 7.6 ok
|
||||
|
Loading…
Reference in New Issue
Block a user