Merge pull request #72212 from lightbulbjim/openrct2-update

openrct2: 0.2.3 -> 0.2.4
This commit is contained in:
Renaud 2019-11-14 18:55:24 +01:00 committed by GitHub
commit e8de40db65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5,27 +5,27 @@
let let
name = "openrct2-${version}"; name = "openrct2-${version}";
version = "0.2.3"; version = "0.2.4";
openrct2-src = fetchFromGitHub { openrct2-src = fetchFromGitHub {
owner = "OpenRCT2"; owner = "OpenRCT2";
repo = "OpenRCT2"; repo = "OpenRCT2";
rev = "v${version}"; rev = "v${version}";
sha256 = "01mj6jlbl2cn3wpk6sy34ldzdl0qykpn7fncznjykklj2nqzr4ig"; sha256 = "1rlw3w20llg36sj3bk50g661qw766ng8ma3p42sdkj8br9dw800h";
}; };
objects-src = fetchFromGitHub { objects-src = fetchFromGitHub {
owner = "OpenRCT2"; owner = "OpenRCT2";
repo = "objects"; repo = "objects";
rev = "v1.0.11"; rev = "v1.0.12";
sha256 = "1bh7mngpqnhzwnhhawq5y3a6hbvwxis2yagk4dcmc4w1fifq2y66"; sha256 = "0vfhyldc8nfvkg4d9kry669haxz2165walbxzgza7pqpnd7aqgrf";
}; };
title-sequences-src = fetchFromGitHub { title-sequences-src = fetchFromGitHub {
owner = "OpenRCT2"; owner = "OpenRCT2";
repo = "title-sequences"; repo = "title-sequences";
rev = "v0.1.2"; rev = "v0.1.2c";
sha256 = "1yb1ynkfmiankii3fngr9km5wbc07rp30nh0apkj6wryrhy7imgm"; sha256 = "1qdrm4q75bznmgdrpjdaiqvbf3q4vwbkkmls45izxvyg1djrpsdf";
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -33,9 +33,13 @@ stdenv.mkDerivation {
src = openrct2-src; src = openrct2-src;
nativeBuildInputs = [
cmake
pkgconfig
];
buildInputs = [ buildInputs = [
SDL2 SDL2
cmake
curl curl
fontconfig fontconfig
freetype freetype
@ -47,7 +51,6 @@ stdenv.mkDerivation {
libzip libzip
libGLU libGLU
openssl openssl
pkgconfig
speexdsp speexdsp
zlib zlib
]; ];