diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 7d94f4236357..2e5899eeae6b 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub +{ lib +, stdenv +, fetchFromGitHub , SDL2 , cmake @@ -26,25 +28,41 @@ }: let - openrct2-version = "0.4.3"; + openrct2-version = "0.4.4"; # Those versions MUST match the pinned versions within the CMakeLists.txt # file. The REPLAYS repository from the CMakeLists.txt is not necessary. - objects-version = "1.3.7"; + objects-version = "1.3.8"; + openmsx-version = "1.1.0"; + opensfx-version = "1.0.2"; title-sequences-version = "0.4.0"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${openrct2-version}"; - sha256 = "sha256-TAe9b7uqdC8XzwDWZkyYKFV+Rn2AeR3MMBZ1lo9pRis="; + sha256 = "sha256-kCGX+L3bXAG9fUjv04T9wV+R20kmmuREHY8h0w+CESg="; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; rev = "v${objects-version}"; - sha256 = "sha256-6c6bbXFi6iqmOOfqggXv3DyYgo4+eiPUIDnkKAAhX5s="; + sha256 = "sha256-7fKv2dSsWJ/YIneyVeuPMjdNI/kgJ7zkMoAgV/s240w="; + }; + + openmsx-src = fetchFromGitHub { + owner = "OpenRCT2"; + repo = "OpenMusic"; + rev = "v${openmsx-version}"; + sha256 = "sha256-SqTYJSst1tgVot/c4seuPQVoxnqWiM2Jb/pP3mHtkKs="; + }; + + opensfx-src = fetchFromGitHub { + owner = "OpenRCT2"; + repo = "OpenSoundEffects"; + rev = "v${opensfx-version}"; + sha256 = "sha256-AMuCpq1Hszi2Vikto/cX9g81LwBDskaRMTLxNzU0/Gk="; }; title-sequences-src = fetchFromGitHub { @@ -91,6 +109,8 @@ stdenv.mkDerivation { cmakeFlags = [ "-DDOWNLOAD_OBJECTS=OFF" + "-DDOWNLOAD_OPENMSX=OFF" + "-DDOWNLOAD_OPENSFX=OFF" "-DDOWNLOAD_TITLE_SEQUENCES=OFF" ]; @@ -100,18 +120,31 @@ stdenv.mkDerivation { ]; postUnpack = '' + mkdir -p $sourceRoot/data/assetpack + cp -r ${objects-src} $sourceRoot/data/object + cp -r ${openmsx-src} $sourceRoot/data/assetpack/openrct2.music.alternative.parkap + cp -r ${opensfx-src} $sourceRoot/data/assetpack/openrct2.sound.parkap cp -r ${title-sequences-src} $sourceRoot/data/sequence ''; - preConfigure = '' + preConfigure = # Verify that the correct version of each third party repository is used. + (let + versionCheck = cmakeKey: version: '' + grep -q '^set(${cmakeKey}_VERSION "${version}")$' CMakeLists.txt \ + || (echo "${cmakeKey} differs from expected version!"; exit 1) + ''; + in + (versionCheck "OBJECTS" objects-version) + + (versionCheck "OPENMSX" openmsx-version) + + (versionCheck "OPENSFX" opensfx-version) + + (versionCheck "TITLE_SEQUENCE" title-sequences-version)) + - grep -q '^set(OBJECTS_VERSION "${objects-version}")$' CMakeLists.txt \ - || (echo "OBJECTS_VERSION differs!"; exit 1) - grep -q '^set(TITLE_SEQUENCE_VERSION "${title-sequences-version}")$' CMakeLists.txt \ - || (echo "TITLE_SEQUENCE_VERSION differs!"; exit 1) - ''; + # Fixup FS rights for the cmake setup-hook in the OPENMSX subsystem + '' + chmod -R +w ./data/assetpack/openrct2.music.alternative.parkap/musictools + ''; preFixup = "ln -s $out/share/openrct2 $out/bin/data";