diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-09-01 14:13:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-01 14:13:21 +0100 |
| commit | b2e7e231ec3ec67545aa9ace003973543dedb801 (patch) | |
| tree | eb5746cdb74077792a9b4066043cff52569c43c0 | |
| parent | Merge pull request #28824 from mguentner/pybitmessage (diff) | |
| parent | crrcsim: build with gcc6 (diff) | |
| download | nixpkgs-b2e7e231ec3ec67545aa9ace003973543dedb801.tar.gz | |
Merge pull request #28825 from disassembler/crrcsim
crrcsim: build with gcc6
| -rw-r--r-- | pkgs/games/crrcsim/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/crrcsim/gcc6.patch | 13 |
2 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix index 68dfefad8d2e..23980c5842b4 100644 --- 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 new file mode 100644 index 000000000000..c19f28c514d7 --- /dev/null +++ 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) |