flare: backport upstream cmake-4 fixes

Without the change the build fails on` master as:

    flare-game> CMake Error at /build/innoextract-1.9/cmake/VersionScript.cmake:20 (cmake_minimum_required):
    flare-game>   Compatibility with CMake < 3.5 has been removed from CMake.
This commit is contained in:
Sergei Trofimovich
2025-10-06 22:45:47 +01:00
parent 0bcf98ab2f
commit fadc49a5dd
2 changed files with 21 additions and 1 deletions
+11 -1
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
SDL2,
SDL2_image,
@@ -20,7 +21,16 @@ stdenv.mkDerivation rec {
hash = "sha256-DIzfTqwZJ8NAPB/TWzvPjepHb7hIbIr+Kk+doXJmpLc=";
};
patches = [ ./desktop.patch ];
patches = [
./desktop.patch
# cmake-4 compatibility patch
(fetchpatch {
name = "cmake-4.patch";
url = "https://github.com/flareteam/flare-engine/commit/9500379f886484382bba2f893faf49865de9f2c0.patch";
hash = "sha256-nUn54ZBEvvFkIhzE/UBbsvF0rFC9JAeQACTAPtsc1VI=";
})
];
nativeBuildInputs = [ cmake ];
buildInputs = [
+10
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
}:
@@ -16,6 +17,15 @@ stdenv.mkDerivation rec {
hash = "sha256-tINIwxyQn8eeJCHwRmAMo2TYRgrgJlGaUrnrgbmM3Jo=";
};
patches = [
# cmake-4 compatibility patch
(fetchpatch {
name = "cmake-4.patch";
url = "https://github.com/flareteam/flare-game/commit/5b61dfd69f4ecbaca6439caa9ae41b3168e4d21a.patch";
hash = "sha256-5Um6LWAWQyialzO3KSebmLju0VOuz1S5dzavO9EWlLE=";
})
];
nativeBuildInputs = [ cmake ];
meta = {