Merge pull request #72037 from kragniz/openrw-2019-10-26

openrw: 2017-09-17 -> 2019-10-26
This commit is contained in:
Dmitry Kalinkin 2019-10-29 16:15:24 -04:00 committed by GitHub
commit 3328244936
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions

View file

@ -1,20 +1,22 @@
{ stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, xlibsWrapper, openal { stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, xlibsWrapper, openal
, SDL2, boost, ffmpeg }: , SDL2, boost, ffmpeg, Cocoa, OpenAL }:
stdenv.mkDerivation { stdenv.mkDerivation {
version = "2017-09-17"; version = "2019-10-26";
pname = "openrw"; pname = "openrw";
src = fetchgit { src = fetchgit {
url = "https://github.com/rwengine/openrw"; url = "https://github.com/rwengine/openrw";
rev = "11e90c61e56b60240251cd080f175ddff7d7a101"; rev = "51b7264744d1aaa20de3b86a7a4e92a9930881ba";
sha256 = "16qklk9yc4ssxxkicxvww4gmg1c7cm6vhyilyv287vhz1fq9sz49"; sha256 = "04s088wfxkfmb4dxdvad611yxj8smxlnxdm5xy81zldfzybvx8dg";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ cmake ];
buildInputs = [ buildInputs = [
cmake sfml libGLU_combined bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg sfml libGLU_combined bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg
]; ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenAL Cocoa ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Unofficial open source recreation of the classic Grand Theft Auto III game executable"; description = "Unofficial open source recreation of the classic Grand Theft Auto III game executable";

View file

@ -22574,7 +22574,9 @@ in
openra = openraPackages.engines.release; openra = openraPackages.engines.release;
openrw = callPackage ../games/openrw { }; openrw = callPackage ../games/openrw {
inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL;
};
openspades = callPackage ../games/openspades { openspades = callPackage ../games/openspades {
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;