From 03df011c3b284e45d3395197505c552a39f06a6a Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sat, 20 Jul 2024 14:14:20 -0500 Subject: [PATCH 1/2] theforceengine: 1.09.540 -> 1.10.000 --- pkgs/games/theforceengine/default.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/games/theforceengine/default.nix b/pkgs/games/theforceengine/default.nix index 8695045d3528..4b66b253f9e0 100644 --- a/pkgs/games/theforceengine/default.nix +++ b/pkgs/games/theforceengine/default.nix @@ -9,17 +9,23 @@ , alsa-lib , cmake , pkg-config +, zenity }: - +let + # package depends on SDL2main static library + SDL2' = SDL2.override { + withStatic = true; + }; +in stdenv.mkDerivation rec { pname = "theforceengine"; - version = "1.09.540"; + version = "1.10.000"; src = fetchFromGitHub { owner = "luciusDXL"; repo = "TheForceEngine"; rev = "v${version}"; - sha256 = "sha256-s54X6LZdk7daIlQPHyRBxc8MLS6bzkkypi4m1m+xK80="; + hash = "sha256-oEcjHb6HY5qxKuPoNBuobPbdi39hUUWtKSb7FbAfEpc="; }; nativeBuildInputs = [ @@ -28,7 +34,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - SDL2 + SDL2' SDL2_image rtaudio rtmidi @@ -39,7 +45,12 @@ stdenv.mkDerivation rec { prePatch = '' # use nix store path instead of hardcoded /usr/share for support data substituteInPlace TheForceEngine/TFE_FileSystem/paths-posix.cpp \ - --replace "/usr/share" "$out/share" + --replace-fail "/usr/share" "$out/share" + + # use zenity from nix store + substituteInPlace TheForceEngine/TFE_Ui/portable-file-dialogs.h \ + --replace-fail "check_program(\"zenity\")" "check_program(\"${lib.getExe zenity}\")" \ + --replace-fail "flags(flag::has_zenity) ? \"zenity\"" "flags(flag::has_zenity) ? \"${lib.getExe zenity}\"" ''; meta = with lib; { From 1f374f0c8dbea13e29dd91c80cf45c28b47f5661 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sat, 20 Jul 2024 14:17:43 -0500 Subject: [PATCH 2/2] theforceengine: move to by-name --- .../default.nix => by-name/th/theforceengine/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{games/theforceengine/default.nix => by-name/th/theforceengine/package.nix} (100%) diff --git a/pkgs/games/theforceengine/default.nix b/pkgs/by-name/th/theforceengine/package.nix similarity index 100% rename from pkgs/games/theforceengine/default.nix rename to pkgs/by-name/th/theforceengine/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2018bdc1ec2..dcc6126f45c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36826,8 +36826,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; - theforceengine = callPackage ../games/theforceengine { }; - tbe = libsForQt5.callPackage ../games/the-butterfly-effect { }; tbls = callPackage ../tools/misc/tbls { };