From 4beef684a80c28d553476590b4f28459d05f52a0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Aug 2011 10:44:57 +0000 Subject: [PATCH] haskell-GLUT: added version 2.2.2.0 svn path=/nixpkgs/trunk/; revision=28566 --- .../libraries/haskell/GLUT/2.2.2.0.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 8 ++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix diff --git a/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix b/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix new file mode 100644 index 00000000000..a9bb5d87bd3 --- /dev/null +++ b/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix @@ -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 + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3aaf19078a7..8a9fb0d4e94 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -611,13 +611,17 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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 {