Merge commit '0c0954781e257b8b0dc49341795a2fe7d96945a3'

2 files changed, 4 insertions, 75 deletions

diff --git a/nixpkgs/pkgs/games/stuntrally/default.nix b/nixpkgs/pkgs/games/stuntrally/default.nix
index c147bfb77ad7..3865d8fbef9e 100644
--- a/nixpkgs/pkgs/games/stuntrally/default.nix
+++ b/nixpkgs/pkgs/games/stuntrally/default.nix
@@ -3,16 +3,16 @@
 
 stdenv.mkDerivation rec {
   name = "stunt-rally-${version}";
-  version = "2.6";
+  version = "2.6.1";
 
   src = fetchurl {
     url = "https://github.com/stuntrally/stuntrally/archive/${version}.tar.gz";
-    sha256 = "1jmsxd2isq9q5paz43c3xw11vr5md1ym8h34b768vxr6gp90khwc";
+    sha256 = "1zxq3x2g9pzafa2awx9jzqd33z6gnqj231cs07paxzrm89y51w4v";
   };
 
   tracks = fetchurl {
     url = "https://github.com/stuntrally/tracks/archive/${version}.tar.gz";
-    sha256 = "0yv88l9s03kp1xkkwnigh0jj593vi3r7vgyg0jn7i8d22q2p1kjb";
+    sha256 = "0x6lgpa4c2grl0vrhqrcs7jcysa3mmvpdl1v5xa0dsf6vkvfr0zs";
   };
 
   # include/OGRE/OgreException.h:265:126: error: invalid conversion from
@@ -22,14 +22,10 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     pushd data
     tar xf ${tracks}
-    mv tracks-2.6 tracks
+    mv tracks-${version} tracks
     popd
   '';
 
-  patches = [
-    ./gcc6.patch
-  ];
-
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ cmake boost ogre mygui ois SDL2 libvorbis 
     makeWrapper enet libXcursor bullet openal
diff --git a/nixpkgs/pkgs/games/stuntrally/gcc6.patch b/nixpkgs/pkgs/games/stuntrally/gcc6.patch
deleted file mode 100644
index 6632ea4e8856..000000000000
--- a/nixpkgs/pkgs/games/stuntrally/gcc6.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git i/source/ogre/CarModel_Create.cpp w/source/ogre/CarModel_Create.cpp
-index 834eac7..47ec647 100644
---- i/source/ogre/CarModel_Create.cpp
-+++ w/source/ogre/CarModel_Create.cpp
-@@ -130,7 +130,8 @@ void CarModel::Load(int startId)
- 
- 	///  load config .car
- 	string pathCar;
--	pApp->gui->GetCarPath(&pathCar, 0, 0, sDirname, pApp->mClient);  // force orig for newtorked games
-+  string empty;
-+	pApp->gui->GetCarPath(&pathCar, &empty, &empty, sDirname, bool(pApp->mClient));  // force orig for newtorked games
- 	LoadConfig(pathCar);
- 	
- 	
-diff --git i/source/ogre/Gui_Tweak.cpp w/source/ogre/Gui_Tweak.cpp
-index 76ed8e9..9444271 100644
---- i/source/ogre/Gui_Tweak.cpp
-+++ w/source/ogre/Gui_Tweak.cpp
-@@ -412,8 +412,8 @@ bool CGui::GetCarPath(std::string* pathCar,
- 		pathUserD = PATHMANAGER::CarSimU() + "/" + pSet->game.sim_mode + "/cars/",
- 		pathUser  = pathUserD + file;
- 
--	if (pathSave)  *pathSave = pathUser;
--	if (pathSaveDir)  *pathSaveDir = pathUserD;
-+	if (pathSave != "")  *pathSave = pathUser;
-+	if (pathSaveDir != "")  *pathSaveDir = pathUserD;
- 	
- 	if (!forceOrig && PATHMANAGER::FileExists(pathUser))
- 	{
-diff --git i/source/vdrift/cartire.cpp w/source/vdrift/cartire.cpp
-index dd6dd48..083fa0c 100644
---- i/source/vdrift/cartire.cpp
-+++ w/source/vdrift/cartire.cpp
-@@ -3,6 +3,7 @@
- #include "cardefs.h"
- //#include "../ogre/common/Def_Str.h"
- 
-+using namespace std;
- 
- void CARTIRE::FindSigmaHatAlphaHat(Dbl load, Dbl & output_sigmahat, Dbl & output_alphahat, int iterations)
- {
-diff --git i/source/vdrift/model_obj.cpp w/source/vdrift/model_obj.cpp
-index 338d122..e67c1db 100644
---- i/source/vdrift/model_obj.cpp
-+++ w/source/vdrift/model_obj.cpp
-@@ -205,7 +205,7 @@ bool MODEL_OBJ::Save(const std::string & strFileName, std::ostream & error_outpu
- 	std::ofstream f(strFileName.c_str());
- 	if (!f)
- 	{
--		error_output << "Error opening file for writing: " << error_output << endl;
-+		error_output << "Error opening file for writing: " << endl;
- 		return false;
- 	}
- 	
-diff --git i/source/vdrift/texture.h w/source/vdrift/texture.h
-index b21846a..c115fd6 100644
---- i/source/vdrift/texture.h
-+++ w/source/vdrift/texture.h
-@@ -125,7 +125,7 @@ class TEXTURELIBRARY
- 		bool FileExists(const std::string & filename)
- 		{
- 			std::ifstream f(filename.c_str());
--			return f;
-+			return bool(f);
- 		}
- 
- 	public: