Merge pull request #273111 from azahi/vcmi-140

vcmi: 1.3.2 -> 1.4.0
This commit is contained in:
Azat Bahawi 2023-12-16 13:20:36 +03:00 committed by GitHub
commit a1e53c0484
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -27,14 +27,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vcmi"; pname = "vcmi";
version = "1.3.2"; version = "1.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vcmi"; owner = "vcmi";
repo = "vcmi"; repo = "vcmi";
rev = version; rev = version;
fetchSubmodules = true; hash = "sha256-MhY3tpKlrIgq6QXZwAkMnObYYpUxsPcysTR5CZH1rhE=";
hash = "sha256-dwTQRpu+IrKhuiiw/uYBt8i/BYlQ5XCy/jUhDAo6aa4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -63,10 +62,10 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DENABLE_LUA:BOOL=ON" "-DENABLE_LUA:BOOL=ON"
"-DENABLE_ERM:BOOL=OFF" "-DENABLE_ERM:BOOL=ON"
"-DENABLE_GITVERSION:BOOL=OFF" "-DENABLE_GITVERSION:BOOL=OFF"
"-DENABLE_PCH:BOOL=OFF" "-DENABLE_PCH:BOOL=OFF"
"-DENABLE_TEST:BOOL=OFF" "-DENABLE_TEST:BOOL=OFF" # Tests require HOMM3 data files.
"-DFORCE_BUNDLED_MINIZIP:BOOL=OFF" "-DFORCE_BUNDLED_MINIZIP:BOOL=OFF"
"-DFORCE_BUNDLED_FL:BOOL=OFF" "-DFORCE_BUNDLED_FL:BOOL=OFF"
"-DCMAKE_INSTALL_RPATH:STRING=$out/lib/vcmi" "-DCMAKE_INSTALL_RPATH:STRING=$out/lib/vcmi"
@ -80,12 +79,10 @@ stdenv.mkDerivation rec {
--prefix PATH : "${lib.makeBinPath [ innoextract ffmpeg unshield ]}" --prefix PATH : "${lib.makeBinPath [ innoextract ffmpeg unshield ]}"
''; '';
doCheck = true;
passthru.tests.version = testers.testVersion { passthru.tests.version = testers.testVersion {
package = vcmi; package = vcmi;
command = '' command = ''
XDG_DATA_HOME=$PWD XDG_CACHE_HOME=$PWD XDG_CONFIG_HOME=$PWD \ XDG_DATA_HOME="$TMPDIR" XDG_CACHE_HOME="$TMPDIR" XDG_CONFIG_HOME="$TMPDIR" \
vcmiclient --version vcmiclient --version
''; '';
}; };
@ -93,8 +90,8 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "An open-source engine for Heroes of Might and Magic III"; description = "An open-source engine for Heroes of Might and Magic III";
homepage = "https://vcmi.eu"; homepage = "https://vcmi.eu";
changelog = "https://github.com/vcmi/vcmi/blob/${src.rev}/ChangeLog"; changelog = "https://github.com/vcmi/vcmi/blob/${src.rev}/ChangeLog.md";
license = with licenses; [ gpl2Only cc-by-sa-40 ]; license = with licenses; [ gpl2Plus cc-by-sa-40 ];
maintainers = with maintainers; [ azahi ]; maintainers = with maintainers; [ azahi ];
platforms = platforms.linux; platforms = platforms.linux;
mainProgram = "vcmilauncher"; mainProgram = "vcmilauncher";