summary refs log tree commit diff
path: root/pkgs/development/libraries/bullet
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2013-03-09 14:54:43 +0100
committerVladimír Čunát <vcunat@gmail.com>2013-03-09 14:59:39 +0100
commit03ba2960a44a23a5683ceac3bea30bf724792594 (patch)
tree76b8bc5c96fca9bd1f789a33c91eb61b9d4c5820 /pkgs/development/libraries/bullet
parent241f94f59f4d2be212064c8fcd2aefbb4fd64877 (diff)
downloadnixpkgs-03ba2960a44a23a5683ceac3bea30bf724792594.tar
nixpkgs-03ba2960a44a23a5683ceac3bea30bf724792594.tar.gz
nixpkgs-03ba2960a44a23a5683ceac3bea30bf724792594.tar.bz2
nixpkgs-03ba2960a44a23a5683ceac3bea30bf724792594.tar.lz
nixpkgs-03ba2960a44a23a5683ceac3bea30bf724792594.tar.xz
nixpkgs-03ba2960a44a23a5683ceac3bea30bf724792594.tar.zst
nixpkgs-03ba2960a44a23a5683ceac3bea30bf724792594.zip
vdrift: update and fix
Tested on two laps :-)
Diffstat (limited to 'pkgs/development/libraries/bullet')
-rw-r--r--pkgs/development/libraries/bullet/default.nix19
1 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix
index b725f6bbf9f..6320dd58e4c 100644
--- a/pkgs/development/libraries/bullet/default.nix
+++ b/pkgs/development/libraries/bullet/default.nix
@@ -1,14 +1,17 @@
-{stdenv, fetchurl, unzip, cmake}:
+{ stdenv, fetchurl, cmake, mesa, freeglut }:
 
-stdenv.mkDerivation {
-  name = "bullet-2.78";
+stdenv.mkDerivation rec {
+  name = "bullet-2.80"; # vdrift 2012-07-22 doesn't build with 2.81
+  rev = "2531";
   src = fetchurl {
-    url = "http://bullet.googlecode.com/files/bullet-2.78.zip";
-    sha256 = "10l2dclvv0di9mi9qp6xfy9vybx182xp2dyygabacrpr3p75s77k";
+    url = "http://bullet.googlecode.com/files/${name}-rev${rev}.tgz";
+    sha256 = "0dig6k88jz5y0cz6dn186vc4l96l4v56zvwpsp5bv9f5wdwjskj6";
   };
-  buildInputs = [ unzip cmake ];
+
+  buildInputs = [ cmake mesa freeglut ];
   configurePhase = ''
-    cmake -DBUILD_SHARED_LIBS=ON -DBUILD_EXTRAS=OFF -DBUILD_DEMOS=OFF .
+    cmake -DBUILD_SHARED_LIBS=ON -DBUILD_EXTRAS=OFF -DBUILD_DEMOS=OFF \
+      -DCMAKE_INSTALL_PREFIX=$out .
   '';
 
   meta = {
@@ -19,6 +22,6 @@ stdenv.mkDerivation {
     '';
     homepage = http://code.google.com/p/bullet/;
     license = stdenv.lib.licenses.zlib;
-    maintainers = [ "Alexander Foremny <alexanderforemny@googlemail.com>" ];
+    maintainers = with stdenv.lib.maintainers; [ aforemny ];
   };
 }