From 519be18d9af75ae6a51b36f6afc8aaa3513d1a7a Mon Sep 17 00:00:00 2001
From: lelgenio <lelgenio@lelgenio.com>
Date: Wed, 21 Jan 2026 13:40:11 -0300
Subject: [PATCH 1/2] material-maker: 1.3 -> 1.5

---
 pkgs/by-name/ma/material-maker/package.nix | 27 ++++++++--------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/ma/material-maker/package.nix b/pkgs/by-name/ma/material-maker/package.nix
index aea2a41e93c2..9aadad833c1a 100644
--- a/pkgs/by-name/ma/material-maker/package.nix
+++ b/pkgs/by-name/ma/material-maker/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  godot3-headless,
-  godot3-export-templates,
-  libglvnd,
+  godot_4_5,
+  vulkan-headers,
+  vulkan-loader,
   libx11,
   libxcursor,
   libxext,
@@ -18,19 +18,20 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "material-maker";
-  version = "1.3";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "RodZill4";
     repo = "material-maker";
     rev = finalAttrs.version;
-    hash = "sha256-vyagu7xL4ITt+xyoYyCcF8qq6L9sR6Ltdl6NwfrbZdA=";
+    hash = "sha256-BnXkEma3J7myF115zMv/VAGtwbbt1asqLUVvRCvrGG8=";
   };
 
-  nativeBuildInputs = [ godot3-headless ];
+  nativeBuildInputs = [ godot_4_5 ];
 
   buildInputs = [
-    libglvnd
+    vulkan-headers
+    vulkan-loader
 
     libxinerama
     libxcursor
@@ -47,18 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
 
     export HOME=$TMPDIR
 
-    # Link the export-templates to the expected location. The --export commands
-    # expects the template-file at .../templates/{godot-version}.stable/linux_x11_64_release
-    mkdir -p $HOME/.local/share/godot
-    ln -s ${godot3-export-templates}/share/godot/templates $HOME/.local/share/godot
-
-    # Don't use the included export template, which might use a mismatched version of godot.
-    rm ./material_maker/misc/linux/godot.x11.opt.64
-    substituteInPlace ./export_presets.cfg \
-      --replace-fail '"material_maker/misc/linux/godot.x11.opt.64"' '""'
-
     mkdir -vp build
-    godot3-headless -v --export 'Linux/X11' build/material-maker
+    godot4 -v --headless --export-release 'Linux/X11' build/material-maker
 
     runHook postBuild
   '';

From 697437a88bdee668ff75150ae250eddca4d07f3d Mon Sep 17 00:00:00 2001
From: lelgenio <lelgenio@lelgenio.com>
Date: Tue, 28 Apr 2026 23:47:44 -0300
Subject: [PATCH 2/2] material-maker: 1.5 -> 1.6

---
 pkgs/by-name/ma/material-maker/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ma/material-maker/package.nix b/pkgs/by-name/ma/material-maker/package.nix
index 9aadad833c1a..9341464b084c 100644
--- a/pkgs/by-name/ma/material-maker/package.nix
+++ b/pkgs/by-name/ma/material-maker/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  godot_4_5,
+  godot_4_6,
   vulkan-headers,
   vulkan-loader,
   libx11,
@@ -18,16 +18,16 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "material-maker";
-  version = "1.5";
+  version = "1.6";
 
   src = fetchFromGitHub {
     owner = "RodZill4";
     repo = "material-maker";
     rev = finalAttrs.version;
-    hash = "sha256-BnXkEma3J7myF115zMv/VAGtwbbt1asqLUVvRCvrGG8=";
+    hash = "sha256-jSbauK9eXoTW2xjZsipWcPs/8qmK8ztmT+doCgu8zrU=";
   };
 
-  nativeBuildInputs = [ godot_4_5 ];
+  nativeBuildInputs = [ godot_4_6 ];
 
   buildInputs = [
     vulkan-headers
@@ -47,6 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
     runHook preBuild
 
     export HOME=$TMPDIR
+    mkdir -p "$HOME/.local/share/godot"
+    ln -s "${godot_4_6.export-templates-bin}/share/godot/export_templates" "$HOME/.local/share/godot/export_templates"
 
     mkdir -vp build
     godot4 -v --headless --export-release 'Linux/X11' build/material-maker