From 1ff7a913595a024a37cb437bb63cf692a4bed26c Mon Sep 17 00:00:00 2001
From: Sebastian Neubauer <Sebastian.Neubauer@amd.com>
Date: Mon, 25 Nov 2024 17:59:42 +0100
Subject: [PATCH 1/2] amdvlk: 2024.Q3.3 -> 2024.Q4.1

2024.Q4.1 was released: https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-2024.Q4.1

Remove previous workaround for glslang, not needed anymore with the
latest version.
---
 pkgs/by-name/am/amdvlk/package.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/am/amdvlk/package.nix b/pkgs/by-name/am/amdvlk/package.nix
index f0d60c42a33a..7d5884c03d80 100644
--- a/pkgs/by-name/am/amdvlk/package.nix
+++ b/pkgs/by-name/am/amdvlk/package.nix
@@ -23,19 +23,17 @@
 let
 
   suffix = if stdenv.system == "x86_64-linux" then "64" else "32";
-  # Fix https://github.com/NixOS/nixpkgs/issues/348903 until the glslang update to 15.0.0 is merged into master
-  glslang_fixed = glslang.overrideAttrs (finalAttrs: oldAttrs: { cmakeFlags = [ ]; });
 
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "amdvlk";
-  version = "2024.Q3.3";
+  version = "2024.Q4.1";
 
   src = fetchRepoProject {
     name = "amdvlk-src";
     manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
     rev = "refs/tags/v-${finalAttrs.version}";
-    hash = "sha256-wIPubMsSaNGTykD/K0gxdba128TqW5nu4CjXoLkprc0=";
+    hash = "sha256-x1g4VKXbkYM2S0tfXWFESyHwalNwH813mtwWjCQK2ew=";
   };
 
   buildInputs =
@@ -61,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
     [
       cmake
       directx-shader-compiler
-      glslang_fixed
+      glslang
       ninja
       patchelf
       perl

From 8a1be565fc42ad76d944de52e2e1a78954984658 Mon Sep 17 00:00:00 2001
From: Sebastian Neubauer <Sebastian.Neubauer@amd.com>
Date: Fri, 6 Dec 2024 17:59:47 +0100
Subject: [PATCH 2/2] amdvlk: 2024.Q4.1.3 -> 2024.Q4.2

2024.Q4.2 was released: https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-2024.Q4.2
---
 pkgs/by-name/am/amdvlk/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/am/amdvlk/package.nix b/pkgs/by-name/am/amdvlk/package.nix
index 7d5884c03d80..f002e8450277 100644
--- a/pkgs/by-name/am/amdvlk/package.nix
+++ b/pkgs/by-name/am/amdvlk/package.nix
@@ -27,13 +27,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "amdvlk";
-  version = "2024.Q4.1";
+  version = "2024.Q4.2";
 
   src = fetchRepoProject {
     name = "amdvlk-src";
     manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
     rev = "refs/tags/v-${finalAttrs.version}";
-    hash = "sha256-x1g4VKXbkYM2S0tfXWFESyHwalNwH813mtwWjCQK2ew=";
+    hash = "sha256-16eHtdxoSCVEPQNvi7Kuo7CP4yddMsZqpuRsWobEOnw=";
   };
 
   buildInputs =