public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging'

Browse Source
This commit is contained in:
Vladimír Čunát
2017-02-04 21:02:46 +01:00
parent d4c996093d 73d798549f
commit a2c867fd39
65 changed files with 642 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/games/openxcom/default.nix
View File

@@ -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;

15
pkgs/games/warmux/gcc-fix.patch
View File

@@ -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);