From 3b59a80fd4a8b09355b03adf5814e09eb52ecb40 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 29 May 2026 07:49:45 +0200
Subject: [PATCH] aws-workspaces: 2025.0.5296 -> 2025.1.5526-1

Co-authored-by: RohanHart <rohan.hart17@gmail.com>
---
 pkgs/by-name/aw/aws-workspaces/package.nix    | 12 +++++++++--
 .../aw/aws-workspaces/workspacesclient.nix    | 21 +++++++++++++------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/aw/aws-workspaces/package.nix b/pkgs/by-name/aw/aws-workspaces/package.nix
index 14c74efa0f12..d680759f8c61 100644
--- a/pkgs/by-name/aw/aws-workspaces/package.nix
+++ b/pkgs/by-name/aw/aws-workspaces/package.nix
@@ -5,7 +5,11 @@
   buildFHSEnv,
   webkitgtk_4_1,
   ffmpeg_7,
-  gtk3,
+  gtk4,
+  libepoxy,
+  wayland,
+  libxcb,
+  libxi,
   pango,
   atk,
   cairo,
@@ -48,7 +52,10 @@ buildFHSEnv {
     workspacesclient
     custom_lsb_release
     webkitgtk_4_1
-    gtk3
+    gtk4
+    libepoxy
+    libxcb
+    libxi
     ffmpeg_7
     pango
     atk
@@ -56,6 +63,7 @@ buildFHSEnv {
     gdk-pixbuf
     protobufc
     cyrus_sasl
+    wayland
   ];
 
   extraBwrapArgs = [
diff --git a/pkgs/by-name/aw/aws-workspaces/workspacesclient.nix b/pkgs/by-name/aw/aws-workspaces/workspacesclient.nix
index 97f1d473c832..d50cd4c1ae14 100644
--- a/pkgs/by-name/aw/aws-workspaces/workspacesclient.nix
+++ b/pkgs/by-name/aw/aws-workspaces/workspacesclient.nix
@@ -5,25 +5,28 @@
   dpkg,
   makeBinaryWrapper,
   glib-networking,
+  wrapGAppsHook4,
+  glib,
 }:
 
 let
-  dcv-path = "lib/x86_64-linux-gnu/workspacesclient/dcv";
+  dcv-path = "lib/x86_64-linux-gnu/workspacesclient";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "workspacesclient";
-  version = "2025.0.5296";
+  version = "2025.1.5526-1";
 
   src = fetchurl {
     urls = [
-      "https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/jammy/main/binary-amd64/workspacesclient_${finalAttrs.version}_amd64.deb"
+      "https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/noble/main/binary-amd64/workspacesclient_${finalAttrs.version}_amd64.ubuntu2404.deb"
     ];
-    hash = "sha256-VPNZN9AsrGJ56O8B5jxlgLMvrUViTv6yto8c5pGQc0A=";
+    hash = "sha256-iGYKpbpzGNeEUKgozhSwVd9dWRgQEbozIAWRu7wu2D8=";
   };
 
   nativeBuildInputs = [
     dpkg
     makeBinaryWrapper
+    wrapGAppsHook4
   ];
 
   installPhase = ''
@@ -38,6 +41,12 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  preFixup = ''
+    schemadir=${glib.makeSchemaPath "$out" "$name"}
+    mv $out/share/workspacesclient/schemas/* $schemadir
+    glib-compile-schemas $schemadir
+  '';
+
   postFixup = ''
     # provide network support
     wrapProgram "$out/bin/workspacesclient" \
@@ -45,8 +54,8 @@ stdenv.mkDerivation (finalAttrs: {
 
     # dcvclient does not setup the environment correctly.
     # Instead wrap the binary directly the correct environment paths
-    mv $out/${dcv-path}/dcvclientbin $out/${dcv-path}/dcvclient
-    wrapProgram $out/${dcv-path}/dcvclient \
+    mv $out/${dcv-path}/dcvviewer $out/${dcv-path}/workspacesclientdcv
+    wrapProgram $out/${dcv-path}/workspacesclientdcv \
       --suffix LD_LIBRARY_PATH : $out/${dcv-path} \
       --suffix GIO_EXTRA_MODULES : ${dcv-path}/gio/modules \
       --set DCV_SASL_PLUGIN_DIR $out/${dcv-path}/sasl2 \