diff --git a/pkgs/by-name/ma/material-maker/package.nix b/pkgs/by-name/ma/material-maker/package.nix index aea2a41e93c2..9341464b084c 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_6, + vulkan-headers, + vulkan-loader, libx11, libxcursor, libxext, @@ -18,19 +18,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "material-maker"; - version = "1.3"; + version = "1.6"; src = fetchFromGitHub { owner = "RodZill4"; repo = "material-maker"; rev = finalAttrs.version; - hash = "sha256-vyagu7xL4ITt+xyoYyCcF8qq6L9sR6Ltdl6NwfrbZdA="; + hash = "sha256-jSbauK9eXoTW2xjZsipWcPs/8qmK8ztmT+doCgu8zrU="; }; - nativeBuildInputs = [ godot3-headless ]; + nativeBuildInputs = [ godot_4_6 ]; buildInputs = [ - libglvnd + vulkan-headers + vulkan-loader libxinerama libxcursor @@ -46,19 +47,11 @@ stdenv.mkDerivation (finalAttrs: { runHook preBuild 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 -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 - godot3-headless -v --export 'Linux/X11' build/material-maker + godot4 -v --headless --export-release 'Linux/X11' build/material-maker runHook postBuild '';