From 5638f2f36d9eb5d564c5acde80769687bdd92bf8 Mon Sep 17 00:00:00 2001
From: Anna Aurora <anna@annaaurora.eu>
Date: Tue, 25 Feb 2025 23:19:58 +0100
Subject: [PATCH] find-billy: 0.37.3 -> 1.0.12

---
 pkgs/by-name/fi/find-billy/package.nix | 28 ++++++++++++++------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/fi/find-billy/package.nix b/pkgs/by-name/fi/find-billy/package.nix
index 94ca57036c36..8cb0c2d78637 100644
--- a/pkgs/by-name/fi/find-billy/package.nix
+++ b/pkgs/by-name/fi/find-billy/package.nix
@@ -2,9 +2,7 @@
   stdenv,
   lib,
   fetchFromGitea,
-  godot3-headless,
-  godot3-export-templates,
-  godot3,
+  godot_4,
   makeWrapper,
   just,
   inkscape,
@@ -13,20 +11,20 @@
 
 stdenv.mkDerivation rec {
   pname = "find-billy";
-  version = "0.37.3";
+  version = "1.0.12";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "annaaurora";
     repo = "Find-Billy";
     rev = "v${version}";
-    hash = "sha256-z1GR5W67LJb5z+u/qeFZreMK4B6PjB18coecLCYFHy8=";
+    hash = "sha256-A8pfkL000pl9ymQCHphb6HFip+Wah4k9Tc/8ruuHQlw=";
   };
 
   strictDeps = true;
 
   nativeBuildInputs = [
-    godot3-headless
+    godot_4
     makeWrapper
     just
     inkscape
@@ -34,10 +32,10 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    substituteInPlace export_presets.cfg --replace 'res://build/icons/usr/share/icons/hicolor' $out/share/icons/hicolor
-    substituteInPlace project.godot --replace 'res://build/icons/usr/share/icons/hicolor' $out/share/icons/hicolor
+    substituteInPlace export_presets.cfg --replace-fail 'res://build/icons/usr/share/icons/hicolor' $out/share/icons/hicolor
+    substituteInPlace project.godot --replace-fail 'res://build/icons/usr/share/icons/hicolor' $out/share/icons/hicolor
 
-    substituteInPlace justfile --replace '{{build_icons_dir}}/usr' $out
+    substituteInPlace justfile --replace-fail '{{build_icons_dir}}/usr' $out
   '';
 
   buildPhase = ''
@@ -47,11 +45,12 @@ stdenv.mkDerivation rec {
     export HOME=$TMPDIR
     # Link the export-templates to the expected location. The `--export` option expects the templates in the home directory.
     mkdir -p $HOME/.local/share/godot
-    ln -s ${godot3-export-templates}/share/godot/templates $HOME/.local/share/godot
+    ln -s ${godot_4}/share/godot/templates $HOME/.local/share/godot
 
     mkdir -p $out/share/find-billy
-    godot3-headless --export-pack 'Linux/X11' $out/share/find-billy/find-billy.pck
-    makeWrapper ${godot3}/bin/godot3 $out/bin/find-billy \
+    # the export preset here is for x86_64 but the pack format is architecture independant
+    godot4 --headless --export-pack 'linux_x86-64' $out/share/find-billy/find-billy.pck
+    makeWrapper ${godot_4}/bin/godot4 $out/bin/find-billy \
       --add-flags "--main-pack" \
       --add-flags "$out/share/find-billy/find-billy.pck"
 
@@ -71,7 +70,10 @@ stdenv.mkDerivation rec {
     description = "2 dimensional Pixel Art Jump & Run";
     homepage = "https://codeberg.org/annaaurora/Find-Billy";
     license = licenses.gpl3Plus;
-    platforms = [ "x86_64-linux" ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
     maintainers = [ maintainers.annaaurora ];
   };
 }