From b12597d1287955d1647a424094e879f4e63512e4 Mon Sep 17 00:00:00 2001 From: Alvar Date: Sat, 14 Jul 2018 00:51:03 +0200 Subject: [PATCH] openrct2: 0.1.2 -> 0.2.0 (#43386) --- pkgs/games/openrct2/default.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 5a35b06a1e3d..9e67c7847f83 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -1,17 +1,24 @@ { stdenv, fetchurl, fetchFromGitHub, - SDL2, cmake, curl, fontconfig, freetype, jansson, libiconv, libpng, + SDL2, cmake, curl, fontconfig, freetype, icu, jansson, libiconv, libpng, libpthreadstubs, libzip, libGLU, openssl, pkgconfig, speexdsp, zlib }: let name = "openrct2-${version}"; - version = "0.1.2"; + version = "0.2.0"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${version}"; - sha256 = "1zqrdxr79c9yx4bdxz1r5866hhwq0lcs9qpv3vhisr56ar5n5wk3"; + sha256 = "1nmz8war8b49iicpc70gk7zlqizrvvwpidqm70lfpa0p68m7m3px"; + }; + + objects-src = fetchFromGitHub { + owner = "OpenRCT2"; + repo = "objects"; + rev = "v1.0.2"; + sha256 = "1gl37fmhhrfgd6gilw0n7hfdq80a9b31bi5r0xhxg7d579jccb04"; }; title-sequences-src = fetchFromGitHub { @@ -32,6 +39,7 @@ stdenv.mkDerivation rec { curl fontconfig freetype + icu jansson libiconv libpng @@ -45,11 +53,15 @@ stdenv.mkDerivation rec { ]; postUnpack = '' - cp -r ${title-sequences-src} $sourceRoot/title + cp -r ${objects-src} $sourceRoot/data/object + cp -r ${title-sequences-src} $sourceRoot/data/title ''; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO" "-DDOWNLOAD_TITLE_SEQUENCES=OFF"]; + "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO" + "-DDOWNLOAD_OBJECTS=OFF" + "-DDOWNLOAD_TITLE_SEQUENCES=OFF" + ]; makeFlags = ["all" "g2"];