From c27e90ce58df36fd047b86a8b73109626fdf215f Mon Sep 17 00:00:00 2001 From: arthsmn Date: Sat, 7 Sep 2024 19:11:32 -0300 Subject: [PATCH] lime3ds: 2117.1 -> 2118 --- pkgs/by-name/li/lime3ds/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/li/lime3ds/package.nix b/pkgs/by-name/li/lime3ds/package.nix index 62c70f5b69f6..5e57360baa38 100644 --- a/pkgs/by-name/li/lime3ds/package.nix +++ b/pkgs/by-name/li/lime3ds/package.nix @@ -42,11 +42,11 @@ inherit (lib) optional optionals cmakeBool optionalString getLib makeLibraryPath; in stdenv.mkDerivation (finalAttrs: { pname = "lime3ds"; - version = "2117.1"; + version = "2118"; src = fetchzip { url = "https://github.com/Lime3DS/Lime3DS/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz"; - hash = "sha256-v6AHzbuk5n55nTDO0UndtmdhovfY4kngC5TJaNIV5S4="; + hash = "sha256-Dt0YKWj+yLUic1F7uOxfWPYlPda3snTUPwFbn23i2rY="; }; nativeBuildInputs = [ @@ -110,7 +110,7 @@ in stdenv.mkDerivation (finalAttrs: { postInstall = let libs = makeLibraryPath [ vulkan-loader ]; in optionalString enableSdl2Frontend '' - for binfile in lime3ds-gui lime3ds-cli lime3ds-room + for binfile in lime3ds lime3ds-room do wrapProgram "$out/bin/$binfile" \ --prefix LD_LIBRARY_PATH : ${libs} @@ -122,17 +122,19 @@ in stdenv.mkDerivation (finalAttrs: { ''; cmakeFlags = [ - (cmakeBool "CITRA_USE_PRECOMPILED_HEADERS" false) - (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations) + (cmakeBool "LIME3DS_USE_PRECOMPILED_HEADERS" false) (cmakeBool "USE_SYSTEM_LIBS" true) (cmakeBool "DISABLE_SYSTEM_DYNARMIC" true) (cmakeBool "DISABLE_SYSTEM_GLSLANG" true) (cmakeBool "DISABLE_SYSTEM_LODEPNG" true) (cmakeBool "DISABLE_SYSTEM_VMA" true) (cmakeBool "DISABLE_SYSTEM_XBYAK" true) + (cmakeBool "ENABLE_QT" enableQt) (cmakeBool "ENABLE_SDL2_FRONTEND" enableSdl2Frontend) (cmakeBool "ENABLE_CUBEB" enableCubeb) (cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence) + ] ++ optionals enableQt [ + (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations) ]; meta = { @@ -140,7 +142,7 @@ in stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Lime3DS/Lime3DS"; license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ arthsmn ]; - mainProgram = if enableQt then "lime3ds-gui" else "lime3ds-cli"; + mainProgram = "lime3ds"; platforms = lib.platforms.linux; }; })