From 7745700a00dff4cd481810e312afeb1bce0cb034 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sun, 23 Mar 2025 20:47:12 -0500 Subject: [PATCH 1/3] theforceengine: 1.15.000 -> 1.22.200 --- pkgs/by-name/th/theforceengine/package.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/th/theforceengine/package.nix b/pkgs/by-name/th/theforceengine/package.nix index 5135dda20a5e..6ba0bf344b68 100644 --- a/pkgs/by-name/th/theforceengine/package.nix +++ b/pkgs/by-name/th/theforceengine/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, SDL2, SDL2_image, rtaudio, @@ -22,23 +21,15 @@ let in stdenv.mkDerivation rec { pname = "theforceengine"; - version = "1.15.000"; + version = "1.22.200"; src = fetchFromGitHub { owner = "luciusDXL"; repo = "TheForceEngine"; rev = "v${version}"; - hash = "sha256-pcPR2KCGbyL1JABF30yJrlcLPGU2h0//Ghf7e7zYO0s="; + hash = "sha256-Mvp9VrPk36wNTUwNQT83JPOEO72Xhqmhkn3/KfZhQX4="; }; - patches = [ - # https://github.com/luciusDXL/TheForceEngine/pull/493 -- fixes finding data files outside program directory - (fetchpatch { - url = "https://github.com/luciusDXL/TheForceEngine/commit/476a5277666bfdffb33ed10bdd1177bfe8ec3a70.diff"; - hash = "sha256-ZcfKIXQMcWMmnM4xfQRd/Ozl09vkQr3jUxZ5e4Mw5CU="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config @@ -58,7 +49,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ (lib.cmakeBool "ENABLE_EDITOR" true) - (lib.cmakeBool "ENABLE_FORCE_SCRIPT" true) ]; prePatch = '' From e9e91364a9bfbbc56c5aeebb14d48fe9854c868e Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sun, 23 Mar 2025 20:47:30 -0500 Subject: [PATCH 2/3] theforceengine: add withEditor flag --- pkgs/by-name/th/theforceengine/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/th/theforceengine/package.nix b/pkgs/by-name/th/theforceengine/package.nix index 6ba0bf344b68..8f77bfa86d56 100644 --- a/pkgs/by-name/th/theforceengine/package.nix +++ b/pkgs/by-name/th/theforceengine/package.nix @@ -12,6 +12,7 @@ cmake, pkg-config, zenity, + withEditor ? true, }: let # package depends on SDL2main static library @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; cmakeFlags = [ - (lib.cmakeBool "ENABLE_EDITOR" true) + (lib.cmakeBool "ENABLE_EDITOR" withEditor) ]; prePatch = '' From 8bf573da6219c8fdb20b00c4904c521313b42971 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sun, 23 Mar 2025 20:47:33 -0500 Subject: [PATCH 3/3] theforceengine: enable building on all linux platforms --- pkgs/by-name/th/theforceengine/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/th/theforceengine/package.nix b/pkgs/by-name/th/theforceengine/package.nix index 8f77bfa86d56..001b277ffc2a 100644 --- a/pkgs/by-name/th/theforceengine/package.nix +++ b/pkgs/by-name/th/theforceengine/package.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { homepage = "https://theforceengine.github.io"; license = licenses.gpl2Only; maintainers = with maintainers; [ devusb ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; }