From 0075b17cef53db33d6532a7b42d28c453eefb763 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 4 Nov 2024 20:30:13 +0100 Subject: [PATCH] taisei: 1.3.2 -> 1.4.2 --- pkgs/by-name/ta/taisei/package.nix | 43 ++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix index e49ddb851ed768..f9521d7b98d654 100644 --- a/pkgs/by-name/ta/taisei/package.nix +++ b/pkgs/by-name/ta/taisei/package.nix @@ -1,13 +1,15 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, # Build depends docutils, meson, ninja, pkg-config, python3, + python312Packages, + ensureNewerSourcesForZipFilesHook, # Runtime depends glfw, SDL2, @@ -18,15 +20,24 @@ libwebp, libzip, zlib, + zstd, + opusfile, + openssl, + gamemode, + shaderc, + spirv-cross, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "taisei"; - version = "1.3.2"; + version = "1.4.2"; - src = fetchurl { - url = "https://github.com/taisei-project/${pname}/releases/download/v${version}/${pname}-v${version}.tar.xz"; - sha256 = "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v"; + src = fetchFromGitHub { + owner = "taisei-project"; + repo = "taisei"; + rev = "v${finalAttrs.version}"; + hash = "sha256-rThLz8o6IYhIBUc0b1sAQi2aF28btajcM1ScTv+qn6c="; + fetchSubmodules = true; }; nativeBuildInputs = [ @@ -35,6 +46,9 @@ stdenv.mkDerivation rec { ninja pkg-config python3 + python312Packages.zstandard + ensureNewerSourcesForZipFilesHook + shaderc ]; buildInputs = [ @@ -47,14 +61,27 @@ stdenv.mkDerivation rec { libwebp libzip zlib + zstd + opusfile + openssl + gamemode + spirv-cross ]; - mesonFlags = [ "-Db_lto=false" ]; + mesonFlags = [ + (lib.mesonBool "b_lto" false) + (lib.mesonEnable "install_macos_bundle" false) + (lib.mesonEnable "install_relocatable" false) + (lib.mesonEnable "install_relocatable" false) + (lib.mesonEnable "shader_transpiler" false) + ]; preConfigure = '' patchShebangs . ''; + strictDeps = true; + meta = { broken = stdenv.hostPlatform.isDarwin; description = "Free and open-source Touhou Project clone and fangame"; @@ -75,4 +102,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +})