From 90dc2159cb51d9a265adb87b0ced52317d703db4 Mon Sep 17 00:00:00 2001 From: Binh Nguyen Date: Sun, 3 May 2026 17:47:21 +1000 Subject: [PATCH] xenia-canary: 0-unstable-2026-02-16 -> 0-unstable-2026-05-03 --- pkgs/by-name/xe/xenia-canary/package.nix | 30 +++++++++++++++++------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/xe/xenia-canary/package.nix b/pkgs/by-name/xe/xenia-canary/package.nix index a9349db11a19..f86b3bfff276 100644 --- a/pkgs/by-name/xe/xenia-canary/package.nix +++ b/pkgs/by-name/xe/xenia-canary/package.nix @@ -9,24 +9,38 @@ ninja, cmake, libuuid, + alsa-lib, wrapGAppsHook3, makeDesktopItem, copyDesktopItems, + glslang, + spirv-tools, + symlinkJoin, llvmPackages_20, autoPatchelfHook, unstableGitUpdater, fetchFromGitHub, }: + +let + vulkan-sdk = symlinkJoin { + name = "vulkan-sdk"; + paths = [ + glslang + spirv-tools + ]; + }; +in llvmPackages_20.stdenv.mkDerivation { pname = "xenia-canary"; - version = "0-unstable-2026-02-16"; + version = "0-unstable-2026-05-03"; src = fetchFromGitHub { owner = "xenia-canary"; repo = "xenia-canary"; fetchSubmodules = true; - rev = "abaa0e4c965265060a89322a1fe3d87384690f82"; - hash = "sha256-i8LW92IGXkdNkRu+zKfDwo7c1o1dYY0rD8mP/vmuaAQ="; + rev = "9467c77f0825f3f8156038ef1a03e27b6c727393"; + hash = "sha256-hGr8KJcvLkluup5FN+MW7+ciuztgGO+SyTvKXYSHeIk="; }; dontConfigure = true; @@ -38,15 +52,14 @@ llvmPackages_20.stdenv.mkDerivation { cmake wrapGAppsHook3 copyDesktopItems + glslang + spirv-tools + llvmPackages_20.lld autoPatchelfHook + alsa-lib libuuid ]; - postPatch = '' - substituteInPlace premake5.lua \ - --replace-fail "cdialect(\"C17\")" "" - ''; # Prevent build failure - env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=unused-result" ]; @@ -59,6 +72,7 @@ llvmPackages_20.stdenv.mkDerivation { buildPhase = '' runHook preBuild + export VULKAN_SDK="${vulkan-sdk}" python3 xenia-build.py setup python3 xenia-build.py build --config=release runHook postBuild