Skip to content

Commit d8a4e9d

Browse files
find-billy: 0.37.3 -> 1.0.12 (#385108)
2 parents 72296a5 + 5638f2f commit d8a4e9d

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

pkgs/by-name/fi/find-billy/package.nix

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
stdenv,
33
lib,
44
fetchFromGitea,
5-
godot3-headless,
6-
godot3-export-templates,
7-
godot3,
5+
godot_4,
86
makeWrapper,
97
just,
108
inkscape,
@@ -13,31 +11,31 @@
1311

1412
stdenv.mkDerivation rec {
1513
pname = "find-billy";
16-
version = "0.37.3";
14+
version = "1.0.12";
1715

1816
src = fetchFromGitea {
1917
domain = "codeberg.org";
2018
owner = "annaaurora";
2119
repo = "Find-Billy";
2220
rev = "v${version}";
23-
hash = "sha256-z1GR5W67LJb5z+u/qeFZreMK4B6PjB18coecLCYFHy8=";
21+
hash = "sha256-A8pfkL000pl9ymQCHphb6HFip+Wah4k9Tc/8ruuHQlw=";
2422
};
2523

2624
strictDeps = true;
2725

2826
nativeBuildInputs = [
29-
godot3-headless
27+
godot_4
3028
makeWrapper
3129
just
3230
inkscape
3331
imagemagick
3432
];
3533

3634
postPatch = ''
37-
substituteInPlace export_presets.cfg --replace 'res://build/icons/usr/share/icons/hicolor' $out/share/icons/hicolor
38-
substituteInPlace project.godot --replace 'res://build/icons/usr/share/icons/hicolor' $out/share/icons/hicolor
35+
substituteInPlace export_presets.cfg --replace-fail 'res://build/icons/usr/share/icons/hicolor' $out/share/icons/hicolor
36+
substituteInPlace project.godot --replace-fail 'res://build/icons/usr/share/icons/hicolor' $out/share/icons/hicolor
3937
40-
substituteInPlace justfile --replace '{{build_icons_dir}}/usr' $out
38+
substituteInPlace justfile --replace-fail '{{build_icons_dir}}/usr' $out
4139
'';
4240

4341
buildPhase = ''
@@ -47,11 +45,12 @@ stdenv.mkDerivation rec {
4745
export HOME=$TMPDIR
4846
# Link the export-templates to the expected location. The `--export` option expects the templates in the home directory.
4947
mkdir -p $HOME/.local/share/godot
50-
ln -s ${godot3-export-templates}/share/godot/templates $HOME/.local/share/godot
48+
ln -s ${godot_4}/share/godot/templates $HOME/.local/share/godot
5149
5250
mkdir -p $out/share/find-billy
53-
godot3-headless --export-pack 'Linux/X11' $out/share/find-billy/find-billy.pck
54-
makeWrapper ${godot3}/bin/godot3 $out/bin/find-billy \
51+
# the export preset here is for x86_64 but the pack format is architecture independant
52+
godot4 --headless --export-pack 'linux_x86-64' $out/share/find-billy/find-billy.pck
53+
makeWrapper ${godot_4}/bin/godot4 $out/bin/find-billy \
5554
--add-flags "--main-pack" \
5655
--add-flags "$out/share/find-billy/find-billy.pck"
5756
@@ -71,7 +70,10 @@ stdenv.mkDerivation rec {
7170
description = "2 dimensional Pixel Art Jump & Run";
7271
homepage = "https://codeberg.org/annaaurora/Find-Billy";
7372
license = licenses.gpl3Plus;
74-
platforms = [ "x86_64-linux" ];
73+
platforms = [
74+
"x86_64-linux"
75+
"aarch64-linux"
76+
];
7577
maintainers = [ maintainers.annaaurora ];
7678
};
7779
}

0 commit comments

Comments
 (0)