From 99d0d6055bf24306e5f2551ab0dcbde1f7da2156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?= =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?= =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= Date: Mon, 18 May 2026 19:34:38 -0400 Subject: [PATCH 1/3] taisei: added philocalyst as maintainer --- pkgs/by-name/ta/taisei/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix index cf60561951d0..be4169e16c7b 100644 --- a/pkgs/by-name/ta/taisei/package.nix +++ b/pkgs/by-name/ta/taisei/package.nix @@ -106,6 +106,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ lambda-11235 Gliczy + philocalyst ]; platforms = lib.platforms.all; }; From 439e1a48e981691121c07b15602349f796a41df4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?= =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?= =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= Date: Mon, 18 May 2026 19:34:46 -0400 Subject: [PATCH 2/3] taisei: added changelog --- pkgs/by-name/ta/taisei/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix index be4169e16c7b..c873c6be0235 100644 --- a/pkgs/by-name/ta/taisei/package.nix +++ b/pkgs/by-name/ta/taisei/package.nix @@ -109,5 +109,6 @@ stdenv.mkDerivation (finalAttrs: { philocalyst ]; platforms = lib.platforms.all; + changelog = "https://github.com/taisei-project/taisei/releases/tag/${finalAttrs.src.tag}"; }; }) From ac6d3384c55f78c45d819ada9f5e92c84ef89601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?= =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?= =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= Date: Mon, 18 May 2026 19:34:55 -0400 Subject: [PATCH 3/3] taisei: fix darwin build --- pkgs/by-name/ta/taisei/package.nix | 57 +++++++++++++++++++++--------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix index c873c6be0235..76230234dad5 100644 --- a/pkgs/by-name/ta/taisei/package.nix +++ b/pkgs/by-name/ta/taisei/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + # Build depends docutils, meson, @@ -13,10 +14,14 @@ gamemode, shaderc, makeWrapper, + cmake, + mimalloc, + glslang, + libogg, + makeBinaryWrapper, + # Runtime depends - glfw, sdl3, - SDL2_mixer, cglm, freetype, libpng, @@ -24,10 +29,10 @@ zlib, zstd, spirv-cross, - mimalloc, gamemodeSupport ? stdenv.hostPlatform.isLinux, }: + stdenv.mkDerivation (finalAttrs: { pname = "taisei"; version = "1.4.4"; @@ -49,12 +54,12 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.zstandard shaderc makeWrapper + makeBinaryWrapper + cmake ]; buildInputs = [ - glfw sdl3 - SDL2_mixer cglm freetype libpng @@ -63,30 +68,48 @@ stdenv.mkDerivation (finalAttrs: { zstd opusfile openssl - spirv-cross mimalloc + libogg + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + glslang + spirv-cross ] ++ lib.optional gamemodeSupport gamemode; + # Forced to use builtin-sincos because the symbol isn't available otherwise + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin " -Dsincos=__builtin_sincos"; + mesonFlags = [ - (lib.mesonBool "b_lto" false) - (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) + (lib.mesonEnable "shader_transpiler_dxbc" false) + (lib.mesonEnable "package_data" false) + (lib.mesonBool "b_lto" false) + (lib.mesonEnable "gamemode" gamemodeSupport) + (lib.mesonEnable "install_freedesktop" stdenv.hostPlatform.isLinux) + (lib.mesonEnable "install_macos_bundle" stdenv.hostPlatform.isDarwin) + (lib.mesonEnable "install_relocatable" stdenv.hostPlatform.isDarwin) + (lib.mesonEnable "shader_transpiler" stdenv.hostPlatform.isDarwin) ]; preConfigure = '' patchShebangs . ''; - postInstall = lib.optionalString gamemodeSupport '' - wrapProgram $out/bin/taisei \ - --set LD_LIBRARY_PATH ${lib.makeLibraryPath [ gamemode ]} - ''; + postInstall = + lib.optionalString (stdenv.hostPlatform.isLinux && gamemodeSupport) '' + wrapProgram $out/bin/taisei \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gamemode ]}" + '' + + + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications $out/bin + + mv $out/Taisei.app $out/Applications/ + # regular symlink will fail here due to resources being missed + makeBinaryWrapper $out/Applications/Taisei.app/Contents/MacOS/Taisei $out/bin/taisei + ''; strictDeps = true;