mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-20 04:31:52 +00:00
Merge pull request #28825 from disassembler/crrcsim
crrcsim: build with gcc6
This commit is contained in:
commit
b2e7e231ec
|
@ -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 ];
|
||||
|
|
13
pkgs/games/crrcsim/gcc6.patch
Normal file
13
pkgs/games/crrcsim/gcc6.patch
Normal file
|
@ -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)
|
Loading…
Reference in a new issue