diff --git a/pkgs/by-name/fl/flare/engine.nix b/pkgs/by-name/fl/flare/engine.nix index afc85deac707..8b9e26d8e2d4 100644 --- a/pkgs/by-name/fl/flare/engine.nix +++ b/pkgs/by-name/fl/flare/engine.nix @@ -12,24 +12,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "flare-engine"; - version = "1.14"; + version = "1.15"; src = fetchFromGitHub { owner = "flareteam"; repo = "flare-engine"; tag = "v${finalAttrs.version}"; - hash = "sha256-DIzfTqwZJ8NAPB/TWzvPjepHb7hIbIr+Kk+doXJmpLc="; + hash = "sha256-QwrSMkJE8dNIODlmdi1c6qgTULhJP9HEV8wI7k5vHAA="; }; 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 ]; diff --git a/pkgs/by-name/fl/flare/game.nix b/pkgs/by-name/fl/flare/game.nix index 9a34465fbd36..c3868c8d2b3d 100644 --- a/pkgs/by-name/fl/flare/game.nix +++ b/pkgs/by-name/fl/flare/game.nix @@ -8,23 +8,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "flare-game"; - version = "1.14"; + version = "1.15"; src = fetchFromGitHub { owner = "flareteam"; repo = "flare-game"; tag = "v${finalAttrs.version}"; - hash = "sha256-tINIwxyQn8eeJCHwRmAMo2TYRgrgJlGaUrnrgbmM3Jo="; + hash = "sha256-IsVfP8wmrublAqoVix7gOA4u8CRmXdyNzagnaXyFsxc="; }; - patches = [ - # cmake-4 compatibility patch - (fetchpatch { - name = "cmake-4.patch"; - url = "https://github.com/flareteam/flare-game/commit/5b61dfd69f4ecbaca6439caa9ae41b3168e4d21a.patch"; - hash = "sha256-5Um6LWAWQyialzO3KSebmLju0VOuz1S5dzavO9EWlLE="; - }) - ]; + patches = [ ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/fl/flare/package.nix b/pkgs/by-name/fl/flare/package.nix index 40816cf42efd..cd6b7b980c95 100644 --- a/pkgs/by-name/fl/flare/package.nix +++ b/pkgs/by-name/fl/flare/package.nix @@ -7,7 +7,7 @@ buildEnv { pname = "flare"; - version = "1.14"; + version = "1.15"; paths = [ (callPackage ./engine.nix { })