From fadc49a5ddb9a09aaf078d9649beaba8f2e972d5 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 6 Oct 2025 22:40:34 +0100 Subject: [PATCH] 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. --- pkgs/by-name/fl/flare/engine.nix | 12 +++++++++++- pkgs/by-name/fl/flare/game.nix | 10 ++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fl/flare/engine.nix b/pkgs/by-name/fl/flare/engine.nix index d466f032dd8c..bfa24d0e9469 100644 --- a/pkgs/by-name/fl/flare/engine.nix +++ b/pkgs/by-name/fl/flare/engine.nix @@ -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 = [ diff --git a/pkgs/by-name/fl/flare/game.nix b/pkgs/by-name/fl/flare/game.nix index e726d3a290e0..59bd9a52d19d 100644 --- a/pkgs/by-name/fl/flare/game.nix +++ b/pkgs/by-name/fl/flare/game.nix @@ -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 = {