From 35c51e32d3963f2364f7bf8a7696c750fd1dd591 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Fri, 24 Oct 2025 17:11:38 +0200 Subject: [PATCH] vkquake: fix build with glslang 16 Signed-off-by: Marcin Serwin --- pkgs/by-name/qu/quakespasm/vulkan.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/qu/quakespasm/vulkan.nix b/pkgs/by-name/qu/quakespasm/vulkan.nix index 1f1db3b66a0d..b71f9e69af97 100644 --- a/pkgs/by-name/qu/quakespasm/vulkan.nix +++ b/pkgs/by-name/qu/quakespasm/vulkan.nix @@ -1,6 +1,7 @@ { SDL2, fetchFromGitHub, + fetchpatch2, flac, glslang, gzip, @@ -20,6 +21,7 @@ vulkan-loader, copyDesktopItems, makeDesktopItem, + spirv-tools, }: stdenv.mkDerivation (finalAttrs: { pname = "vkquake"; @@ -35,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper glslang + spirv-tools meson ninja pkg-config @@ -57,6 +60,14 @@ stdenv.mkDerivation (finalAttrs: { vulkan-headers ]; + patches = [ + (fetchpatch2 { + # https://github.com/Novum/vkQuake/pull/809 + url = "https://github.com/Novum/vkQuake/commit/85ddf2386f15944c26317a763d4044077fc8731f.patch?full_index=1"; + hash = "sha256-t+atA+ilCwGwLpql5BZO2OF4Xh1KdzRFjOpglTIA/KY="; + }) + ]; + mesonFlags = [ "-Ddo_userdirs=enabled" ]; env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {