From aa3a280b8dfd3fb5b59207b8cb1d9cf268cdd8d0 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 18 Apr 2024 14:56:34 -0300 Subject: [PATCH 1/5] godot_4: 4.2.1-stable -> 4.2.2-stable Release: https://github.com/godotengine/godot-builds/releases/tag/4.2.2-stable Changelog: https://github.com/godotengine/godot/blob/4.2.2-stable/CHANGELOG.md#422---2024-04-17 --- pkgs/development/tools/godot/4/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index 29cc7543e37f..e1e51f76988b 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -43,14 +43,14 @@ let in stdenv.mkDerivation rec { pname = "godot4"; - version = "4.2.1-stable"; - commitHash = "b09f793f564a6c95dc76acc654b390e68441bd01"; + version = "4.2.2-stable"; + commitHash = "15073afe3856abd2aa1622492fe50026c7d63dc1"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = commitHash; - hash = "sha256-Q6Og1H4H2ygOryMPyjm6kzUB6Su6T9mJIp0alNAxvjQ="; + hash = "sha256-anJgPEeHIW2qIALMfPduBVgbYYyz1PWCmPsZZxS9oHI="; }; nativeBuildInputs = [ From 2af4510ed28706e309f2c04a6a14ac4e60bccaaa Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 18 Apr 2024 15:27:04 -0300 Subject: [PATCH 2/5] godot_4-export-templates: init 4.2.2-stable --- .../by-name/go/godot_4-export-templates/package.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 pkgs/by-name/go/godot_4-export-templates/package.nix diff --git a/pkgs/by-name/go/godot_4-export-templates/package.nix b/pkgs/by-name/go/godot_4-export-templates/package.nix new file mode 100644 index 000000000000..be1240737649 --- /dev/null +++ b/pkgs/by-name/go/godot_4-export-templates/package.nix @@ -0,0 +1,13 @@ +# Export templates is necessary for setting up Godot engine, it's used when exporting projects. +# Godot applications/games packages needs to reference export templates. +# Export templates version should be kept in sync with Godot version. +# https://docs.godotengine.org/en/stable/tutorials/export/exporting_projects.html#export-templates + +{ fetchzip, godot_4, ... }: + +fetchzip { + pname = "export_templates"; + extension = "zip"; + url = "https://github.com/godotengine/godot/releases/download/${godot_4.version}/Godot_v${godot_4.version}_export_templates.tpz"; + hash = "sha256-eomGLH9lbZhl7VtHTWjJ5mxVt0Yg8LfnAnpqoCksPgs="; +} From e53463627cff6159df6923b3fa0834d5834a4d3c Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 18 Apr 2024 16:23:42 -0300 Subject: [PATCH 3/5] godot_4: enable debug flag --- pkgs/development/tools/godot/4/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index e1e51f76988b..c08162605ce9 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -22,6 +22,7 @@ , speechd , fontconfig , udev +, withDebug ? false , withPlatform ? "linuxbsd" , withTarget ? "editor" , withPrecision ? "single" @@ -115,6 +116,7 @@ stdenv.mkDerivation rec { platform = withPlatform; target = withTarget; precision = withPrecision; # Floating-point precision level + debug_symbols = withDebug; # Options from 'platform/linuxbsd/detect.py' pulseaudio = withPulseaudio; # Use PulseAudio @@ -125,6 +127,8 @@ stdenv.mkDerivation rec { touch = withTouch; # Enable touch events }; + dontStrip = withDebug; + outputs = [ "out" "man" ]; installPhase = '' From 1912515d378497feac53430bb2ba4edd3d091cb1 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 18 Apr 2024 16:31:05 -0300 Subject: [PATCH 4/5] godot_4: refactor nested with --- pkgs/development/tools/godot/4/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index c08162605ce9..1bbbcdcc3849 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -146,12 +146,12 @@ stdenv.mkDerivation rec { cp icon.png "$out/share/icons/godot.png" ''; - meta = with lib; { + meta = { homepage = "https://godotengine.org"; description = "Free and Open Source 2D and 3D game engine"; - license = licenses.mit; + license = lib.licenses.mit; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ shiryel ]; + maintainers = with lib.maintainers; [ shiryel ]; mainProgram = "godot4"; }; } From 824ba819434d6fa18cef5e0c9c9ece6922253d7d Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 18 Apr 2024 16:31:28 -0300 Subject: [PATCH 5/5] godot_4: add superherointj as maintainer --- pkgs/development/tools/godot/4/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index 1bbbcdcc3849..b0db2e0b4f4f 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation rec { description = "Free and Open Source 2D and 3D game engine"; license = lib.licenses.mit; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; - maintainers = with lib.maintainers; [ shiryel ]; + maintainers = with lib.maintainers; [ shiryel superherointj ]; mainProgram = "godot4"; }; }