openrct2: 0.4.3 -> 0.4.4

https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.4.4

This change introduces two new sub modules, OPENMSX and OPENSFX. The
first one required a permission fix for cmake. Furthermore, I refactored
the version check as we are now counting four modules and I don't want
to copy and paste the same check with small modifications four times.
This commit is contained in:
Alvar Penning 2023-04-07 17:53:52 +02:00
parent a95ea32100
commit dacdc849f0

View File

@ -1,4 +1,6 @@
{ lib, stdenv, fetchFromGitHub { lib
, stdenv
, fetchFromGitHub
, SDL2 , SDL2
, cmake , cmake
@ -26,25 +28,41 @@
}: }:
let let
openrct2-version = "0.4.3"; openrct2-version = "0.4.4";
# Those versions MUST match the pinned versions within the CMakeLists.txt # Those versions MUST match the pinned versions within the CMakeLists.txt
# file. The REPLAYS repository from the CMakeLists.txt is not necessary. # 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"; title-sequences-version = "0.4.0";
openrct2-src = fetchFromGitHub { openrct2-src = fetchFromGitHub {
owner = "OpenRCT2"; owner = "OpenRCT2";
repo = "OpenRCT2"; repo = "OpenRCT2";
rev = "v${openrct2-version}"; rev = "v${openrct2-version}";
sha256 = "sha256-TAe9b7uqdC8XzwDWZkyYKFV+Rn2AeR3MMBZ1lo9pRis="; sha256 = "sha256-kCGX+L3bXAG9fUjv04T9wV+R20kmmuREHY8h0w+CESg=";
}; };
objects-src = fetchFromGitHub { objects-src = fetchFromGitHub {
owner = "OpenRCT2"; owner = "OpenRCT2";
repo = "objects"; repo = "objects";
rev = "v${objects-version}"; 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 { title-sequences-src = fetchFromGitHub {
@ -91,6 +109,8 @@ stdenv.mkDerivation {
cmakeFlags = [ cmakeFlags = [
"-DDOWNLOAD_OBJECTS=OFF" "-DDOWNLOAD_OBJECTS=OFF"
"-DDOWNLOAD_OPENMSX=OFF"
"-DDOWNLOAD_OPENSFX=OFF"
"-DDOWNLOAD_TITLE_SEQUENCES=OFF" "-DDOWNLOAD_TITLE_SEQUENCES=OFF"
]; ];
@ -100,18 +120,31 @@ stdenv.mkDerivation {
]; ];
postUnpack = '' postUnpack = ''
mkdir -p $sourceRoot/data/assetpack
cp -r ${objects-src} $sourceRoot/data/object 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 cp -r ${title-sequences-src} $sourceRoot/data/sequence
''; '';
preConfigure = '' preConfigure =
# Verify that the correct version of each third party repository is used. # 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 \ # Fixup FS rights for the cmake setup-hook in the OPENMSX subsystem
|| (echo "OBJECTS_VERSION differs!"; exit 1) ''
grep -q '^set(TITLE_SEQUENCE_VERSION "${title-sequences-version}")$' CMakeLists.txt \ chmod -R +w ./data/assetpack/openrct2.music.alternative.parkap/musictools
|| (echo "TITLE_SEQUENCE_VERSION differs!"; exit 1) '';
'';
preFixup = "ln -s $out/share/openrct2 $out/bin/data"; preFixup = "ln -s $out/share/openrct2 $out/bin/data";