Fixing stunt-rally 2.6 (adding newer bullet)

pkgs/development/libraries/bullet/bullet283.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, cmake, mesa, freeglut }:
+
+stdenv.mkDerivation rec {
+  name = "bullet-2.83.7"; # vdrift 2012-07-22 doesn't build with 2.81
+  src = fetchurl {
+    url = "https://github.com/bulletphysics/bullet3/archive/2.83.7.tar.gz";
+    sha256 = "0hqjnmlb2p29yiasrm7kvgv0nklz5zkwhfk4f78zz1gf0vrdil80";
+  };
+
+  buildInputs = [ cmake mesa freeglut ];
+  configurePhase = ''
+    cmake -DBUILD_SHARED_LIBS=ON -DINSTALL_EXTRA_LIBS=TRUE \
+      -DCMAKE_INSTALL_PREFIX=$out .
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "A professional free 3D Game Multiphysics Library";
+    longDescription = ''
+      Bullet 3D Game Multiphysics Library provides state of the art collision
+      detection, soft body and rigid body dynamics. 
+    '';
+    homepage = https://github.com/bulletphysics/bullet3;
+    license = stdenv.lib.licenses.zlib;
+    maintainers = with stdenv.lib.maintainers; [ aforemny ];
+  };
+}

pkgs/games/stuntrally/default.nix

@@ -1,40 +1,42 @@
-{ fetchgit, stdenv, cmake, boost, ogre, mygui, ois, SDL2, libvorbis, pkgconfig
+{ fetchurl, stdenv, cmake, boost, ogre, mygui, ois, SDL2, libvorbis, pkgconfig
-, makeWrapper, enet, libXcursor }:
+, makeWrapper, enet, libXcursor, bullet, openal }:
 
 stdenv.mkDerivation rec {
   name = "stunt-rally-${version}";
   version = "2.6";
 
-  src = fetchgit {
+  src = fetchurl {
-    url = git://github.com/stuntrally/stuntrally.git;
+    url = "https://github.com/stuntrally/stuntrally/archive/${version}.tar.gz";
-    rev = "refs/tags/${version}";
+    sha256 = "1jmsxd2isq9q5paz43c3xw11vr5md1ym8h34b768vxr6gp90khwc";
-    sha256 = "0rrfmldl6m7igni1n4rv2i0s2q5j1ik8dh05ydkaqrpcky96bdr8";
   };
 
-  tracks = fetchgit {
+  tracks = fetchurl {
-    url = git://github.com/stuntrally/tracks.git;
+    url = "https://github.com/stuntrally/tracks/archive/${version}.tar.gz";
-    rev = "refs/tags/${version}";
+    sha256 = "0yv88l9s03kp1xkkwnigh0jj593vi3r7vgyg0jn7i8d22q2p1kjb";
-    sha256 = "186qqyr1nrabfzsgy7b4sjgm38mgd875f4c7qwkm8k2bl7zjkrm2";
   };
 
+  # include/OGRE/OgreException.h:265:126: error: invalid conversion from
+  # 'int' to 'Ogre::Exception::ExceptionCodes' [-fpermissive]
+  NIX_CFLAGS_COMPILE="-fpermissive";
+
   preConfigure = ''
-    cp -R ${tracks} data/tracks
+    pushd data
-    chmod u+rwX -R data
+    tar xf ${tracks}
+    mv tracks-2.6 tracks
+    popd
   '';
 
   buildInputs = [ cmake boost ogre mygui ois SDL2 libvorbis pkgconfig 
-    makeWrapper enet libXcursor
+    makeWrapper enet libXcursor bullet openal
   ];
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "Stunt Rally game with Track Editor, based on VDrift and OGRE";
-    homepage = http://code.google.com/p/vdrift-ogre/;
+    homepage = http://stuntrally.tuxfamily.org/;
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ pSub ];
     platforms = platforms.linux;
-    # Build failure
-    broken = true;
   };
 }

pkgs/top-level/all-packages.nix

@@ -15199,7 +15199,12 @@ in
 
   stepmania = callPackage ../games/stepmania { };
 
-  stuntrally = callPackage ../games/stuntrally { };
+  stuntrally = callPackage ../games/stuntrally {
+    bullet = bullet283;
+    mygui = mygui.override {
+      withOgre = true;
+    };
+  };
 
   superTux = callPackage ../games/super-tux { };
 
@@ -16787,6 +16792,7 @@ in
   misc = callPackage ../misc/misc.nix { };
 
   bullet = callPackage ../development/libraries/bullet {};
+  bullet283 = callPackage ../development/libraries/bullet/bullet283.nix {};
 
   spdlog = callPackage ../development/libraries/spdlog { };