diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix index ad5aa48c7c5d..2dd27400961d 100644 --- a/pkgs/games/vcmi/default.nix +++ b/pkgs/games/vcmi/default.nix @@ -27,14 +27,13 @@ stdenv.mkDerivation rec { pname = "vcmi"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "vcmi"; repo = "vcmi"; rev = version; - fetchSubmodules = true; - hash = "sha256-dwTQRpu+IrKhuiiw/uYBt8i/BYlQ5XCy/jUhDAo6aa4="; + hash = "sha256-MhY3tpKlrIgq6QXZwAkMnObYYpUxsPcysTR5CZH1rhE="; }; nativeBuildInputs = [ @@ -63,10 +62,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_LUA:BOOL=ON" - "-DENABLE_ERM:BOOL=OFF" + "-DENABLE_ERM:BOOL=ON" "-DENABLE_GITVERSION: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_FL:BOOL=OFF" "-DCMAKE_INSTALL_RPATH:STRING=$out/lib/vcmi" @@ -80,12 +79,10 @@ stdenv.mkDerivation rec { --prefix PATH : "${lib.makeBinPath [ innoextract ffmpeg unshield ]}" ''; - doCheck = true; - passthru.tests.version = testers.testVersion { package = vcmi; 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 ''; }; @@ -93,8 +90,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An open-source engine for Heroes of Might and Magic III"; homepage = "https://vcmi.eu"; - changelog = "https://github.com/vcmi/vcmi/blob/${src.rev}/ChangeLog"; - license = with licenses; [ gpl2Only cc-by-sa-40 ]; + changelog = "https://github.com/vcmi/vcmi/blob/${src.rev}/ChangeLog.md"; + license = with licenses; [ gpl2Plus cc-by-sa-40 ]; maintainers = with maintainers; [ azahi ]; platforms = platforms.linux; mainProgram = "vcmilauncher";