citrix_workspace: 25.05 -> 25.08

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 ];

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

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; };