diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-04 21:02:46 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-04 21:02:46 +0100 |
| commit | a2c867fd394306bf28804696eef67c9bb7ffbbcb (patch) | |
| tree | 5b6e34e05e8328a8e754a476b2f12fcd86e34783 /pkgs/games | |
| parent | d4c996093d2834e3e1979db109547c8c6683a652 (diff) | |
| parent | 73d798549fdc5a77245558ac27976ac76a2c44e7 (diff) | |
| download | nixlib-a2c867fd394306bf28804696eef67c9bb7ffbbcb.tar nixlib-a2c867fd394306bf28804696eef67c9bb7ffbbcb.tar.gz nixlib-a2c867fd394306bf28804696eef67c9bb7ffbbcb.tar.bz2 nixlib-a2c867fd394306bf28804696eef67c9bb7ffbbcb.tar.lz nixlib-a2c867fd394306bf28804696eef67c9bb7ffbbcb.tar.xz nixlib-a2c867fd394306bf28804696eef67c9bb7ffbbcb.tar.zst nixlib-a2c867fd394306bf28804696eef67c9bb7ffbbcb.zip | |
Merge branch 'staging'
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/openxcom/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/games/warmux/gcc-fix.patch | 15 |
2 files changed, 21 insertions, 1 deletions
diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 204663e1448c..65c2a42922b2 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, mesa, zlib, openssl, libyamlcpp, boost +{stdenv, fetchurl, fetchpatch, cmake, mesa, zlib, openssl, libyamlcpp, boost , SDL, SDL_image, SDL_mixer, SDL_gfx }: let version = "1.0.0"; in @@ -13,6 +13,11 @@ stdenv.mkDerivation { buildInputs = [ cmake mesa zlib openssl libyamlcpp boost SDL SDL_image SDL_mixer SDL_gfx ]; + patches = [ (fetchpatch { + url = "https://github.com/SupSuper/OpenXcom/commit/49bec0851fc6e5365cac0f71b2c40a80ddf95e77.patch"; + sha256 = "156fk8wz4qc0nmqq3zjb6kw84qirabads2azr6xvlgb3lcn327v2"; + }) ]; + meta = { description = "Open source clone of UFO: Enemy Unknown"; homepage = http://openxcom.org; diff --git a/pkgs/games/warmux/gcc-fix.patch b/pkgs/games/warmux/gcc-fix.patch index 1ac476b92a32..913b912af7d4 100644 --- a/pkgs/games/warmux/gcc-fix.patch +++ b/pkgs/games/warmux/gcc-fix.patch @@ -34,3 +34,18 @@ Author: Felix Geyer <debfx-pkg@fobos.de> #include <WARMUX_types.h> #include <WARMUX_network.h> #include <WARMUX_index_server.h> + +Description: Fix conversion error in gcc 6. +Author: Robin Gloster <mail@glob.in> + +--- warmux-11.04.1.orig/src/interface/weapon_menu.cpp 2017-01-19 23:06:32.401035923 +0100 ++++ warmux-11.04.1/src/interface/weapon_menu.cpp 2017-01-19 23:07:14.245866593 +0100 +@@ -391,7 +391,7 @@ + Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly) + { + if (!show) +- return false; ++ return nullptr; + const std::vector<PolygonItem *>& items = poly->GetItem(); + WeaponMenuItem * tmp; + Interface::GetInstance()->SetCurrentOverflyWeapon(NULL); |