crrcsim: build with gcc6

(cherry picked from commit 6bc775c)
NixOS · Sep 1, 2017 · 37568fd · 37568fd
1 parent 39099cd
commit 37568fd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix
@@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
     mesa SDL SDL_mixer plib libjpeg
   ];
 
+  patches = [
+    ./gcc6.patch
+  ];
+
   meta = {
     description = "A model-airplane flight simulator";
     maintainers = with stdenv.lib.maintainers; [ raskin the-kenny ];

diff --git a/pkgs/games/crrcsim/gcc6.patch b/pkgs/games/crrcsim/gcc6.patch
@@ -0,0 +1,13 @@
+diff --git c/src/mod_video/crrc_animation.cpp i/src/mod_video/crrc_animation.cpp
+index ee7d7f4..855b106 100644
+--- c/src/mod_video/crrc_animation.cpp
++++ i/src/mod_video/crrc_animation.cpp
+@@ -84,7 +84,7 @@ void createAnimation(SimpleXMLTransfer *animation, ssgEntity* model)
+       else
+       {
+         std::cerr << "createAnimation: unknown animation type \'"
+-                  << type << "\'" << std::cerr;
++                  << type << "\'" << std::endl;
+       }
+
+       if (anim != NULL)