From 3affc7fb8fb0226ab314342ecc2986c35f0ce0e2 Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Sat, 26 Oct 2019 18:40:53 +0100 Subject: [PATCH 1/2] openrw: 2017-09-17 -> 2019-10-26 --- pkgs/games/openrw/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index f35077c084aa..eae29722b6be 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -2,13 +2,13 @@ , SDL2, boost, ffmpeg }: stdenv.mkDerivation { - version = "2017-09-17"; + version = "2019-10-26"; pname = "openrw"; src = fetchgit { url = "https://github.com/rwengine/openrw"; - rev = "11e90c61e56b60240251cd080f175ddff7d7a101"; - sha256 = "16qklk9yc4ssxxkicxvww4gmg1c7cm6vhyilyv287vhz1fq9sz49"; + rev = "51b7264744d1aaa20de3b86a7a4e92a9930881ba"; + sha256 = "04s088wfxkfmb4dxdvad611yxj8smxlnxdm5xy81zldfzybvx8dg"; fetchSubmodules = true; }; From ddbf53b855e4355f2f933898dad910dca0c15ca8 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 29 Oct 2019 12:59:06 -0400 Subject: [PATCH 2/2] openrw: move cmake to nativeBuildInputs, fix on darwin Darwin fix as suggested by @risicle --- pkgs/games/openrw/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index eae29722b6be..368fba1499f6 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, xlibsWrapper, openal -, SDL2, boost, ffmpeg }: +, SDL2, boost, ffmpeg, Cocoa, OpenAL }: stdenv.mkDerivation { version = "2019-10-26"; @@ -12,9 +12,11 @@ stdenv.mkDerivation { fetchSubmodules = true; }; + nativeBuildInputs = [ cmake ]; + 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; { description = "Unofficial open source recreation of the classic Grand Theft Auto III game executable"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf96880e2df2..8e0a7039f057 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22545,7 +22545,9 @@ in openra = openraPackages.engines.release; - openrw = callPackage ../games/openrw { }; + openrw = callPackage ../games/openrw { + inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; + }; openspades = callPackage ../games/openspades { inherit (darwin.apple_sdk.frameworks) Cocoa;