diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-14 06:01:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-14 06:01:05 +0000 |
| commit | 0ca05466650fb2d64552740f5333686d44a9ef0f (patch) | |
| tree | 74eedf948e7393da58ef48bb22db6b726a541e32 /pkgs/games | |
| parent | 9b5a10585626b6cb1940da8c94502ce64113b67f (diff) | |
| parent | 91137787da325c9b05da41b2fdad2ac0974fcf8a (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/openrw/default.nix | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index 4064023fafd35..f1bcab2895fb0 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -1,21 +1,37 @@ -{ lib, stdenv, fetchgit, cmake, sfml, libGLU, libGL, bullet, glm, libmad, xlibsWrapper, openal -, SDL2, boost, ffmpeg_3, Cocoa, OpenAL }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, sfml +, libGLU +, libGL +, bullet +, glm +, libmad +, xlibsWrapper +, openal +, SDL2 +, boost +, ffmpeg +, Cocoa +, OpenAL }: stdenv.mkDerivation { - version = "2019-10-26"; + version = "unstable-2021-10-14"; pname = "openrw"; - src = fetchgit { - url = "https://github.com/rwengine/openrw"; - rev = "51b7264744d1aaa20de3b86a7a4e92a9930881ba"; - sha256 = "04s088wfxkfmb4dxdvad611yxj8smxlnxdm5xy81zldfzybvx8dg"; + src = fetchFromGitHub { + owner = "rwengine"; + repo = "openrw"; + rev = "0f83c16f6518c427a4f156497c3edc843610c402"; + sha256 = "0i6nx9g0xb8sziak5swi8636fszcjjx8n2jwgz570izw2fl698ff"; fetchSubmodules = true; }; nativeBuildInputs = [ cmake ]; buildInputs = [ - sfml libGLU libGL bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg_3 + sfml libGLU libGL bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg ] ++ lib.optionals stdenv.isDarwin [ OpenAL Cocoa ]; meta = with lib; { |