Unverified Commit 123edd97 authored by superherointj's avatar superherointj Committed by GitHub
Browse files

Merge pull request #305118 from superherointj/godot-4.2.2-stable 

godot_4: 4.2.1-stable -> 4.2.2-stable
parents 68a917dc 824ba819

pkgs/by-name/go/godot_4-export-templates/package.nix

0 → 100644
+13 −0
Original line number Diff line number Diff line 
# 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=";

}

pkgs/development/tools/godot/4/default.nix

+10 −6
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
, speechd

, fontconfig

, udev

, withDebug ? false

, withPlatform ? "linuxbsd"

, withTarget ? "editor"

, withPrecision ? "single"
@@ -43,14 +44,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 = [
@@ -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 = ''
@@ -142,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 superherointj ];

    mainProgram = "godot4";

  };

}