From aadacfb3dd5ef0bd81064094dfde7ef458a47fc4 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Tue, 26 Aug 2025 17:00:55 +0200 Subject: [PATCH 1/2] taisei: 1.4.2 -> 1.4.4 --- pkgs/by-name/ta/taisei/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix index 20d634de5de2..10abb09c8c0f 100644 --- a/pkgs/by-name/ta/taisei/package.nix +++ b/pkgs/by-name/ta/taisei/package.nix @@ -12,32 +12,30 @@ openssl, gamemode, shaderc, - ensureNewerSourcesForZipFilesHook, # Runtime depends glfw, - SDL2, + sdl3, SDL2_mixer, cglm, freetype, libpng, libwebp, - libzip, zlib, zstd, spirv-cross, + mimalloc, gamemodeSupport ? stdenv.hostPlatform.isLinux, }: - stdenv.mkDerivation (finalAttrs: { pname = "taisei"; - version = "1.4.2"; + version = "1.4.4"; src = fetchFromGitHub { owner = "taisei-project"; repo = "taisei"; tag = "v${finalAttrs.version}"; - hash = "sha256-rThLz8o6IYhIBUc0b1sAQi2aF28btajcM1ScTv+qn6c="; + hash = "sha256-Cs66kyNSVjUZUH+ddZGjFwSUQtwqX4uuGQh+ZLv6N6o="; fetchSubmodules = true; }; @@ -48,24 +46,23 @@ stdenv.mkDerivation (finalAttrs: { pkg-config python3Packages.python python3Packages.zstandard - ensureNewerSourcesForZipFilesHook shaderc ]; buildInputs = [ glfw - SDL2 + sdl3 SDL2_mixer cglm freetype libpng libwebp - libzip zlib zstd opusfile openssl spirv-cross + mimalloc ] ++ lib.optional gamemodeSupport gamemode; @@ -74,7 +71,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "install_macos_bundle" false) (lib.mesonEnable "install_relocatable" false) (lib.mesonEnable "shader_transpiler" false) + (lib.mesonEnable "shader_transpiler_dxbc" false) (lib.mesonEnable "gamemode" gamemodeSupport) + (lib.mesonEnable "package_data" false) + (lib.mesonEnable "vfs_zip" false) ]; preConfigure = '' From c07dda5631fc056395a441d5b71900540b4d84e1 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Tue, 26 Aug 2025 17:02:05 +0200 Subject: [PATCH 2/2] taisei: fix gamemode support --- pkgs/by-name/ta/taisei/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix index 10abb09c8c0f..cf60561951d0 100644 --- a/pkgs/by-name/ta/taisei/package.nix +++ b/pkgs/by-name/ta/taisei/package.nix @@ -12,6 +12,7 @@ openssl, gamemode, shaderc, + makeWrapper, # Runtime depends glfw, sdl3, @@ -47,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.python python3Packages.zstandard shaderc + makeWrapper ]; buildInputs = [ @@ -81,6 +83,11 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs . ''; + postInstall = lib.optionalString gamemodeSupport '' + wrapProgram $out/bin/taisei \ + --set LD_LIBRARY_PATH ${lib.makeLibraryPath [ gamemode ]} + ''; + strictDeps = true; meta = {