From 919bcf965c06626dfb66415bc0e3292806bb9bf7 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 25 Nov 2025 13:40:32 +0100
Subject: [PATCH 1/8] citrix_workspace: remove unused code for unsupported
 versions

These unused version attributes were not imported into all-packages.nix
anymore anyway, so remove them entirely.
---
 .../remote/citrix-workspace/default.nix       | 22 ++++---------------
 .../remote/citrix-workspace/sources.nix       | 15 +------------
 2 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix
index c6bd8596920b..22b7ea21154e 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/default.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix
@@ -4,24 +4,10 @@
 # reference guide: https://developer-docs.citrix.com/en-us/citrix-workspace-app-for-linux/citrix-workspace-app-for-linux-oem-reference-guide
 
 let
-  inherit (callPackage ./sources.nix { }) supportedVersions unsupportedVersions;
+  supportedVersions = callPackage ./sources.nix { };
 
   toAttrName = x: "citrix_workspace_${builtins.replaceStrings [ "." ] [ "_" ] x}";
-
-  unsupported = lib.listToAttrs (
-    map (
-      x:
-      lib.nameValuePair (toAttrName x) (throw ''
-        Citrix Workspace at version ${x} is not supported anymore!
-
-        Actively supported releases are listed here:
-        https://www.citrix.com/support/product-lifecycle/workspace-app.html
-      '')
-    ) unsupportedVersions
-  );
-
-  supported = lib.mapAttrs' (
-    attr: versionInfo: lib.nameValuePair (toAttrName attr) (callPackage ./generic.nix versionInfo)
-  ) supportedVersions;
 in
-supported // unsupported
+lib.mapAttrs' (
+  attr: versionInfo: lib.nameValuePair (toAttrName attr) (callPackage ./generic.nix versionInfo)
+) supportedVersions
diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
index 597d24487271..e7bceff1e805 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
@@ -106,18 +106,5 @@ let
       homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
     };
   };
-
-  # Retain attribute-names for abandoned versions of Citrix workspace to
-  # provide a meaningful error-message if it's attempted to use such an old one.
-  #
-  # The lifespans of Citrix products can be found here:
-  # https://www.citrix.com/support/product-lifecycle/workspace-app.html
-  unsupportedVersions = [
-    "23.02.0"
-    "23.07.0"
-    "23.09.0"
-  ];
 in
-{
-  inherit supportedVersions unsupportedVersions;
-}
+supportedVersions

From 94e0074d9d7b995f1895b2af121735badc27cf6a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 25 Nov 2025 13:48:12 +0100
Subject: [PATCH 2/8] citrix_workspace_{23_11_0,24_02_0}: drop

These versions have been EOL:
- 23.11 since 2025-07-13
- 24.02 since 2025-09-07

See https://www.citrix.com/support/product-lifecycle/workspace-app.html
for reference.

Along with the removal of 23.11, we can remove all the i686-linux
related code here.
---
 .../remote/citrix-workspace/generic.nix       | 11 ++-
 .../remote/citrix-workspace/sources.nix       | 68 ++++---------------
 pkgs/top-level/aliases.nix                    |  2 +
 pkgs/top-level/all-packages.nix               |  2 -
 4 files changed, 21 insertions(+), 62 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index 57e0ff7ee8c6..b922277baba2 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -61,7 +61,6 @@
 
   homepage,
   version,
-  prefix,
   hash,
 
   extraCerts ? [ ],
@@ -97,12 +96,12 @@ stdenv.mkDerivation rec {
   inherit version;
 
   src = requireFile rec {
-    name = "${prefix}-${version}.tar.gz";
+    name = "linuxx64-${version}.tar.gz";
     sha256 = hash;
 
     message = ''
       In order to use Citrix Workspace, you need to comply with the Citrix EULA and download
-      the ${if stdenv.hostPlatform.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from:
+      the 64-bit binaries, .tar.gz from:
 
       ${homepage}
 
@@ -247,9 +246,9 @@ stdenv.mkDerivation rec {
       export HOME=$(mktemp -d)
 
       # Run upstream installer in the store-path.
-      sed -i -e 's,^ANSWER="",ANSWER="$INSTALLER_YES",g' -e 's,/bin/true,true,g' ./${prefix}/hinst
+      sed -i -e 's,^ANSWER="",ANSWER="$INSTALLER_YES",g' -e 's,/bin/true,true,g' ./linuxx64/hinst
       source_date=$(date --utc --date=@$SOURCE_DATE_EPOCH "+%F %T")
-      faketime -f "$source_date" ${stdenv.shell} ${prefix}/hinst CDROM "$(pwd)"
+      faketime -f "$source_date" ${stdenv.shell} linuxx64/hinst CDROM "$(pwd)"
 
       if [ -f "$ICAInstDir/util/setlog" ]; then
         chmod +x "$ICAInstDir/util/setlog"
@@ -318,7 +317,7 @@ stdenv.mkDerivation rec {
     license = lib.licenses.unfree;
     description = "Citrix Workspace";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    platforms = [ "x86_64-linux" ] ++ lib.optional (lib.versionOlder version "24") "i686-linux";
+    platforms = [ "x86_64-linux" ];
     maintainers = with lib.maintainers; [ flacks ];
     inherit homepage;
   };
diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
index e7bceff1e805..372a46cf99ab 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
@@ -7,58 +7,26 @@ let
       major,
       minor,
       patch,
-      x64hash,
-      x86hash,
-      x64suffix,
-      x86suffix,
+      hash,
+      suffix,
       homepage,
     }:
     {
-      inherit homepage;
-      version = "${major}.${minor}.${patch}.${
-        if stdenv.hostPlatform.is64bit then x64suffix else x86suffix
-      }";
-      prefix = "linuxx${if stdenv.hostPlatform.is64bit then "64" else "86"}";
-      hash = if stdenv.hostPlatform.is64bit then x64hash else x86hash;
+      inherit hash homepage;
+      version = "${major}.${minor}.${patch}.${suffix}";
     };
 
   # Attribute-set with all actively supported versions of the Citrix workspace app
   # for Linux.
   #
   # The latest versions can be found at https://www.citrix.com/downloads/workspace-app/linux/
-  # x86 is unsupported past 23.11, see https://docs.citrix.com/en-us/citrix-workspace-app-for-linux/deprecation
   supportedVersions = lib.mapAttrs mkVersionInfo {
-
-    "23.11.0" = {
-      major = "23";
-      minor = "11";
-      patch = "0";
-      x64hash = "d3dde64baa6db7675a025eff546d552544d3523f4f3047621884f7830a9e2822";
-      x86hash = "65b8c144e51b5bd78b98ae69e0fa76d6c020a857d74fd5254be49492527072b6";
-      x64suffix = "82";
-      x86suffix = "82";
-      homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest10.html";
-    };
-
-    "24.02.0" = {
-      major = "24";
-      minor = "2";
-      patch = "0";
-      x64hash = "eaeb5d3bd079d4e5c9707da67f5f7a25cb765e19c36d01861290655dbf2aaee4";
-      x86hash = "";
-      x64suffix = "65";
-      x86suffix = "";
-      homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest12.html";
-    };
-
     "24.05.0" = {
       major = "24";
       minor = "5";
       patch = "0";
-      x64hash = "sha256-pye2JOilSbp8PFCpVXFkrRW98E8klCqoisVSWjR38nE=";
-      x86hash = "";
-      x64suffix = "76";
-      x86suffix = "";
+      hash = "sha256-pye2JOilSbp8PFCpVXFkrRW98E8klCqoisVSWjR38nE=";
+      suffix = "76";
       homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest1.html";
     };
 
@@ -66,10 +34,8 @@ let
       major = "24";
       minor = "8";
       patch = "0";
-      x64hash = "1jb22n6gcv4pv8khg98sv663yfpi47dpkvqgifbhps98iw5zrkbp";
-      x86hash = "";
-      x64suffix = "98";
-      x86suffix = "";
+      hash = "1jb22n6gcv4pv8khg98sv663yfpi47dpkvqgifbhps98iw5zrkbp";
+      suffix = "98";
       homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest-2408.html";
     };
 
@@ -77,10 +43,8 @@ let
       major = "24";
       minor = "11";
       patch = "0";
-      x64hash = "0kylvqdzkw0635mbb6r5k1lamdjf1hr9pk5rxcff63z4f8q0g3zf";
-      x86hash = "";
-      x64suffix = "85";
-      x86suffix = "";
+      hash = "0kylvqdzkw0635mbb6r5k1lamdjf1hr9pk5rxcff63z4f8q0g3zf";
+      suffix = "85";
       homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest13.html";
     };
 
@@ -88,10 +52,8 @@ let
       major = "25";
       minor = "03";
       patch = "0";
-      x64hash = "052zibykhig9091xl76z2x9vn4f74w5q8i9frlpc473pvfplsczk";
-      x86hash = "";
-      x64suffix = "66";
-      x86suffix = "";
+      hash = "052zibykhig9091xl76z2x9vn4f74w5q8i9frlpc473pvfplsczk";
+      suffix = "66";
       homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest-2503.html";
     };
 
@@ -99,10 +61,8 @@ let
       major = "25";
       minor = "05";
       patch = "0";
-      x64hash = "0fwqsxggswms40b5k8saxpm1ghkxppl27x19w8jcslq1f0i1fwqx";
-      x86hash = "";
-      x64suffix = "44";
-      x86suffix = "";
+      hash = "0fwqsxggswms40b5k8saxpm1ghkxppl27x19w8jcslq1f0i1fwqx";
+      suffix = "44";
       homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
     };
   };
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d4f5aad043eb..be84ff2c2396 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -432,6 +432,8 @@ mapAliases {
   chrome-gnome-shell = throw "'chrome-gnome-shell' has been renamed to/replaced by 'gnome-browser-connector'"; # Converted to throw 2025-10-27
   ci-edit = throw "'ci-edit' has been removed due to lack of maintenance upstream"; # Added 2025-08-26
   cinnamon-common = cinnamon; # Added 2025-08-06
+  citrix_workspace_23_11_0 = throw "'citrix_workspace_23_11_0' has been removed because it has reached EOL."; # Added 2025-11-25
+  citrix_workspace_24_02_0 = throw "'citrix_workspace_24_02_0' has been removed because it has reached EOL."; # Added 2025-11-25
   clamsmtp = throw "'clamsmtp' has been removed as it is unmaintained and broken"; # Added 2025-05-17
   clang12Stdenv = throw "clang12Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   clang13Stdenv = throw "clang13Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce1fa4a97445..9a40118d4ac5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2181,8 +2181,6 @@ with pkgs;
   circus = with python310Packages; toPythonApplication circus;
 
   inherit (callPackage ../applications/networking/remote/citrix-workspace { })
-    citrix_workspace_23_11_0
-    citrix_workspace_24_02_0
     citrix_workspace_24_05_0
     citrix_workspace_24_08_0
     citrix_workspace_24_11_0

From 4547216587058d33aaec646e66fa9e5a5d6c9de9 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 25 Nov 2025 15:34:08 +0100
Subject: [PATCH 3/8] citrix_workspace: 25.05 -> 25.08

---
 .../remote/citrix-workspace/generic.nix       | 43 +++++++++++++++----
 .../remote/citrix-workspace/sources.nix       |  9 ++++
 pkgs/top-level/all-packages.nix               |  3 +-
 3 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index b922277baba2..93b95bf13239 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -10,10 +10,12 @@
   cacert,
   cairo,
   dconf,
+  enchant2,
   fetchurl,
   file,
   fontconfig,
   freetype,
+  fuse3,
   gdk-pixbuf,
   glib,
   glib-networking,
@@ -22,8 +24,11 @@
   gtk2-x11,
   gtk3,
   gtk_engines,
+  harfbuzzFull,
   heimdal,
+  hyphen,
   krb5,
+  lcms2,
   libGL,
   libappindicator-gtk3,
   libcanberra-gtk3,
@@ -32,15 +37,19 @@
   libfaketime,
   libgbm,
   libinput,
-  libjpeg,
+  libjpeg8,
   libjson,
+  libmanette,
+  libnotify,
   libpng12,
   libpulseaudio,
   libredirect,
+  libseccomp,
   libsecret,
   libsoup_2_4,
   libvorbis,
   libxml2_13,
+  libxslt,
   llvmPackages,
   more,
   nspr,
@@ -54,8 +63,8 @@
   symlinkJoin,
   systemd,
   tzdata,
-  # webkitgtk_4_0,
   which,
+  woff2,
   xorg,
   zlib,
 
@@ -67,6 +76,14 @@
 }:
 
 let
+  fuse3' = symlinkJoin {
+    name = "fuse3-backwards-compat";
+    paths = [ (lib.getLib fuse3) ];
+    postBuild = ''
+      ln -sf $out/lib/libfuse3.so.3.17.4 $out/lib/libfuse3.so.3
+    '';
+  };
+
   openssl' = symlinkJoin {
     name = "openssl-backwards-compat";
     nativeBuildInputs = [ makeWrapper ];
@@ -136,8 +153,10 @@ stdenv.mkDerivation rec {
     atk
     cairo
     dconf
+    enchant2
     fontconfig
     freetype
+    fuse3'
     gdk-pixbuf
     glib-networking
     gnome2.gtkglext
@@ -145,22 +164,29 @@ stdenv.mkDerivation rec {
     gtk2-x11
     gtk3
     gtk_engines
+    harfbuzzFull
     heimdal
+    hyphen
     krb5
+    lcms2
     libGL
     libcanberra-gtk3
     libcap
     libcxx
     libgbm
     libinput
-    libjpeg
+    libjpeg8
     libjson
+    libmanette
+    libnotify
     libpng12
     libpulseaudio
+    libseccomp
     libsecret
     libsoup_2_4
     libvorbis
     libxml2_13
+    libxslt
     llvmPackages.libunwind
     nspr
     nss
@@ -172,7 +198,7 @@ stdenv.mkDerivation rec {
     speex
     stdenv.cc.cc
     (lib.getLib systemd)
-    # webkitgtk_4_0
+    woff2
     xorg.libXScrnSaver
     xorg.libXaw
     xorg.libXmu
@@ -246,7 +272,7 @@ stdenv.mkDerivation rec {
       export HOME=$(mktemp -d)
 
       # Run upstream installer in the store-path.
-      sed -i -e 's,^ANSWER="",ANSWER="$INSTALLER_YES",g' -e 's,/bin/true,true,g' ./linuxx64/hinst
+      sed -i -e 's,^ANSWER="",ANSWER="$INSTALLER_YES",g' -e 's,/bin/true,true,g' -e 's, -C / , -C . ,g' ./linuxx64/hinst
       source_date=$(date --utc --date=@$SOURCE_DATE_EPOCH "+%F %T")
       faketime -f "$source_date" ${stdenv.shell} linuxx64/hinst CDROM "$(pwd)"
 
@@ -302,8 +328,6 @@ stdenv.mkDerivation rec {
     find $out/opt/citrix-icaclient/lib -name "libopencv_imgcodecs.so.*" | while read -r fname; do
       # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
       patchelf --replace-needed libtiff.so.5 libtiff.so $fname
-      # lib needs libjpeg.so.8, but nixpkgs provides libjpeg.so.9
-      patchelf --replace-needed libjpeg.so.8 libjpeg.so $fname
     done
   '';
   postFixup = ''
@@ -312,8 +336,9 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    # webkitgtk_4_0 was removed
-    broken = true;
+    # Older versions need webkitgtk_4_0 which was removed.
+    # 25.08 bundles the same.
+    broken = lib.versionOlder version "25.08";
     license = lib.licenses.unfree;
     description = "Citrix Workspace";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
index 372a46cf99ab..51ab49212f89 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
@@ -65,6 +65,15 @@ let
       suffix = "44";
       homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
     };
+
+    "25.08.0" = {
+      major = "25";
+      minor = "08";
+      patch = "0";
+      hash = "19nx7j78c84m6wlidkaicqf5rgy05rm85vzh3admhrl8q9zr1avr";
+      suffix = "88";
+      homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
+    };
   };
 in
 supportedVersions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a40118d4ac5..40ae481dba6c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2186,8 +2186,9 @@ with pkgs;
     citrix_workspace_24_11_0
     citrix_workspace_25_03_0
     citrix_workspace_25_05_0
+    citrix_workspace_25_08_0
     ;
-  citrix_workspace = citrix_workspace_25_05_0;
+  citrix_workspace = citrix_workspace_25_08_0;
 
   colord-gtk4 = colord-gtk.override { withGtk4 = true; };
 

From 08d273674d6beade9a4d1ae33dbec44c12b42b2e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 3 Dec 2025 15:41:30 +0100
Subject: [PATCH 4/8] citrix_workspace: remove unused fixup phase

libtiff is not a dependency anymore, anyway...
---
 .../networking/remote/citrix-workspace/generic.nix          | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index 93b95bf13239..02af2f1b1972 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -324,12 +324,6 @@ stdenv.mkDerivation rec {
   # Make sure that `autoPatchelfHook` is executed before
   # running `ctx_rehash`.
   dontAutoPatchelf = true;
-  preFixup = ''
-    find $out/opt/citrix-icaclient/lib -name "libopencv_imgcodecs.so.*" | while read -r fname; do
-      # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
-      patchelf --replace-needed libtiff.so.5 libtiff.so $fname
-    done
-  '';
   postFixup = ''
     autoPatchelf -- "$out"
     $out/opt/citrix-icaclient/util/ctx_rehash

From cd9fd1e48077b95ad8232f1d61db076b2fd8a2a6 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 3 Dec 2025 15:47:42 +0100
Subject: [PATCH 5/8] citrix_workspace: remove outdated fallback removals

These libraries are not shipped anymore.
---
 .../networking/remote/citrix-workspace/generic.nix           | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index 02af2f1b1972..b1df4250e217 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -299,11 +299,6 @@ stdenv.mkDerivation rec {
 
       ${mkWrappers copyCert extraCerts}
 
-      # See https://developer-docs.citrix.com/en-us/citrix-workspace-app-for-linux/citrix-workspace-app-for-linux-oem-reference-guide/reference-information/#library-files
-      # Those files are fallbacks to support older libwekit.so and libjpeg.so
-      rm $out/opt/citrix-icaclient/lib/ctxjpeg_fb_8.so || true
-      rm $out/opt/citrix-icaclient/lib/UIDialogLibWebKit.so || true
-
       # We support only Gstreamer 1.0
       rm $ICAInstDir/util/{gst_aud_{play,read},gst_*0.10,libgstflatstm0.10.so} || true
       ln -sf $ICAInstDir/util/gst_play1.0 $ICAInstDir/util/gst_play

From 1ab621eb6d614a37ff04ab3847d0d3913b060484 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 25 Nov 2025 16:29:17 +0100
Subject: [PATCH 6/8] citrix_workspace_{24_05,24_08,24_11,25_03,25_05}_0: drop

All of these versions depend on a system-provided webkitgtk 4.0, which
we have dropped from Nixpkgs - they can't work anymore, ever.
---
 .../remote/citrix-workspace/sources.nix       | 45 -------------------
 pkgs/top-level/aliases.nix                    |  5 +++
 pkgs/top-level/all-packages.nix               |  5 ---
 3 files changed, 5 insertions(+), 50 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
index 51ab49212f89..edcc9f2135f9 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
@@ -21,51 +21,6 @@ let
   #
   # The latest versions can be found at https://www.citrix.com/downloads/workspace-app/linux/
   supportedVersions = lib.mapAttrs mkVersionInfo {
-    "24.05.0" = {
-      major = "24";
-      minor = "5";
-      patch = "0";
-      hash = "sha256-pye2JOilSbp8PFCpVXFkrRW98E8klCqoisVSWjR38nE=";
-      suffix = "76";
-      homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest1.html";
-    };
-
-    "24.08.0" = {
-      major = "24";
-      minor = "8";
-      patch = "0";
-      hash = "1jb22n6gcv4pv8khg98sv663yfpi47dpkvqgifbhps98iw5zrkbp";
-      suffix = "98";
-      homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest-2408.html";
-    };
-
-    "24.11.0" = {
-      major = "24";
-      minor = "11";
-      patch = "0";
-      hash = "0kylvqdzkw0635mbb6r5k1lamdjf1hr9pk5rxcff63z4f8q0g3zf";
-      suffix = "85";
-      homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest13.html";
-    };
-
-    "25.03.0" = {
-      major = "25";
-      minor = "03";
-      patch = "0";
-      hash = "052zibykhig9091xl76z2x9vn4f74w5q8i9frlpc473pvfplsczk";
-      suffix = "66";
-      homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest-2503.html";
-    };
-
-    "25.05.0" = {
-      major = "25";
-      minor = "05";
-      patch = "0";
-      hash = "0fwqsxggswms40b5k8saxpm1ghkxppl27x19w8jcslq1f0i1fwqx";
-      suffix = "44";
-      homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
-    };
-
     "25.08.0" = {
       major = "25";
       minor = "08";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index be84ff2c2396..d733e3bb3603 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -434,6 +434,11 @@ mapAliases {
   cinnamon-common = cinnamon; # Added 2025-08-06
   citrix_workspace_23_11_0 = throw "'citrix_workspace_23_11_0' has been removed because it has reached EOL."; # Added 2025-11-25
   citrix_workspace_24_02_0 = throw "'citrix_workspace_24_02_0' has been removed because it has reached EOL."; # Added 2025-11-25
+  citrix_workspace_24_05_0 = throw "'citrix_workspace_24_05_0' has been removed because it depended on the removed webkitgtk_4_0."; # Added 2025-11-25
+  citrix_workspace_24_08_0 = throw "'citrix_workspace_24_08_0' has been removed because it depended on the removed webkitgtk_4_0."; # Added 2025-11-25
+  citrix_workspace_24_11_0 = throw "'citrix_workspace_24_11_0' has been removed because it depended on the removed webkitgtk_4_0."; # Added 2025-11-25
+  citrix_workspace_25_03_0 = throw "'citrix_workspace_25_03_0' has been removed because it depended on the removed webkitgtk_4_0."; # Added 2025-11-25
+  citrix_workspace_25_05_0 = throw "'citrix_workspace_25_05_0' has been removed because it depended on the removed webkitgtk_4_0."; # Added 2025-11-25
   clamsmtp = throw "'clamsmtp' has been removed as it is unmaintained and broken"; # Added 2025-05-17
   clang12Stdenv = throw "clang12Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   clang13Stdenv = throw "clang13Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40ae481dba6c..c4c750e28be4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2181,11 +2181,6 @@ with pkgs;
   circus = with python310Packages; toPythonApplication circus;
 
   inherit (callPackage ../applications/networking/remote/citrix-workspace { })
-    citrix_workspace_24_05_0
-    citrix_workspace_24_08_0
-    citrix_workspace_24_11_0
-    citrix_workspace_25_03_0
-    citrix_workspace_25_05_0
     citrix_workspace_25_08_0
     ;
   citrix_workspace = citrix_workspace_25_08_0;

From 37ead022cdfbafda63dbe08a9b851ff5c6f229db Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 7 Jan 2026 16:24:43 -0600
Subject: [PATCH 7/8] citrix_workspace: 25.08.00 -> 25.08.10

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../networking/remote/citrix-workspace/sources.nix        | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
index edcc9f2135f9..34f0c8e627ae 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix
@@ -21,12 +21,12 @@ let
   #
   # The latest versions can be found at https://www.citrix.com/downloads/workspace-app/linux/
   supportedVersions = lib.mapAttrs mkVersionInfo {
-    "25.08.0" = {
+    "25.08.10" = {
       major = "25";
       minor = "08";
-      patch = "0";
-      hash = "19nx7j78c84m6wlidkaicqf5rgy05rm85vzh3admhrl8q9zr1avr";
-      suffix = "88";
+      patch = "10";
+      hash = "06hdwi5rd8z43nlpvym6yrw3snfz8jh6ic3g4pihn9ji22bw5pbd";
+      suffix = "111";
       homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
     };
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4c750e28be4..a3e4a621218c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2181,9 +2181,9 @@ with pkgs;
   circus = with python310Packages; toPythonApplication circus;
 
   inherit (callPackage ../applications/networking/remote/citrix-workspace { })
-    citrix_workspace_25_08_0
+    citrix_workspace_25_08_10
     ;
-  citrix_workspace = citrix_workspace_25_08_0;
+  citrix_workspace = citrix_workspace_25_08_10;
 
   colord-gtk4 = colord-gtk.override { withGtk4 = true; };
 

From 090fb8a52ea22f3f6b77c62fe036135aab61de31 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 3 Dec 2025 21:50:02 -0600
Subject: [PATCH 8/8] citrix_workspace: fix selfservice

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../networking/remote/citrix-workspace/generic.nix    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index b1df4250e217..2dc0171aa9c5 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -11,7 +11,6 @@
   cairo,
   dconf,
   enchant2,
-  fetchurl,
   file,
   fontconfig,
   freetype,
@@ -58,6 +57,7 @@
   openssl,
   pango,
   pcsclite,
+  perl,
   sane-backends,
   speex,
   symlinkJoin,
@@ -241,9 +241,9 @@ stdenv.mkDerivation rec {
           ${lib.optionalString (icaFlag program != null) ''--add-flags "${icaFlag program} $ICAInstDir"''} \
           --set ICAROOT "$ICAInstDir" \
           --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \
-          --prefix LD_LIBRARY_PATH : "$ICAInstDir:$ICAInstDir/lib" \
+          --prefix LD_LIBRARY_PATH : "$ICAInstDir:$ICAInstDir/lib:$ICAInstDir/usr/lib/x86_64-linux-gnu:$ICAInstDir/usr/lib/x86_64-linux-gnu/webkit2gtk-4.0/injected-bundle" \
           --set LD_PRELOAD "${libredirect}/lib/libredirect.so ${lib.getLib pcsclite}/lib/libpcsclite.so" \
-          --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone"
+          --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone:/usr/lib/x86_64-linux-gnu=$ICAInstDir/usr/lib/x86_64-linux-gnu"
       '';
       wrapLink = program: ''
         ${wrap program}
@@ -319,8 +319,13 @@ stdenv.mkDerivation rec {
   # Make sure that `autoPatchelfHook` is executed before
   # running `ctx_rehash`.
   dontAutoPatchelf = true;
+  # Null out hardcoded webkit bundle path so it falls back to LD_LIBRARY_PATH
   postFixup = ''
+    ${lib.getExe perl} -0777 -pi -e 's{/usr/lib/x86_64-linux-gnu/webkit2gtk-4.0/injected-bundle/}{"\0" x length($&)}e' \
+      $out/opt/citrix-icaclient/usr/lib/x86_64-linux-gnu/libwebkit2gtk-4.0.so.37.56.4
+
     autoPatchelf -- "$out"
+
     $out/opt/citrix-icaclient/util/ctx_rehash
   '';