diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2018-02-13 15:24:43 +0100 |
|---|---|---|
| committer | Andreas Rammhold <andreas@rammhold.de> | 2018-02-13 16:31:59 +0100 |
| commit | 77dba4865ffb241840d41163cd35a0230e53efad (patch) | |
| tree | ca8c8bd317315b71efe2944c8c3b95bdc9ff77f2 /pkgs/games/openxcom | |
| parent | 85d0eb712f5f6c7e19731361559cfa47cd1c138a (diff) | |
openxcom: 1.0.0 -> 1.0.0.2018.01.28
Update to a recent git head since porting more compiler fixes without
affecting the gameplay/features would require writing custom patches.
The current maintainer (@cpages) ack'ed this change via IRC.
Diffstat (limited to 'pkgs/games/openxcom')
| -rw-r--r-- | pkgs/games/openxcom/default.nix | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 65c2a42922b2..bf451af9ad73 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -1,22 +1,18 @@ -{stdenv, fetchurl, fetchpatch, cmake, mesa, zlib, openssl, libyamlcpp, boost +{stdenv, fetchFromGitHub, fetchpatch, cmake, mesa, zlib, openssl, libyamlcpp, boost , SDL, SDL_image, SDL_mixer, SDL_gfx }: -let version = "1.0.0"; in +let version = "1.0.0.2018.01.28"; in stdenv.mkDerivation { name = "openxcom-${version}"; - src = fetchurl { - url = http://openxcom.org/file/1726/; - sha256 = "1rmg10nklvf86ckbbssyvbg5cd4p7in5zq3mas2yyffdjk9i40v6"; - name = "openxcom-${version}.tar.gz"; + src = fetchFromGitHub { + owner = "SupSuper"; + repo = "OpenXcom"; + rev = "b148916268a6ce104c3b6b7eb4d9e0487cba5487"; + sha256 = "1128ip3g4aw59f3f23mvlyhl8xckhwjjw9rd7wn7xv51hxdh191c"; }; - 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"; - }) ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost libyamlcpp mesa openssl zlib ]; meta = { description = "Open source clone of UFO: Enemy Unknown"; |