From a3b66b2eee8ca526d56079a19f3cbffe6ad9a7f6 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 24 Jun 2025 17:22:22 -0500 Subject: [PATCH 1/4] citrix_workspace: fix tray icon Signed-off-by: Austin Horstman --- .../applications/networking/remote/citrix-workspace/generic.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 35f7f893a8d3..d7a3050a3f76 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -56,6 +56,7 @@ libcanberra-gtk3, sane-backends, fetchurl, + libappindicator-gtk3, homepage, version, @@ -190,6 +191,7 @@ stdenv.mkDerivation rec { glib glib-networking pcsclite + libappindicator-gtk3 xorg.libX11 xorg.libXScrnSaver From 3fb4c89bdf6c762eb1ebaabc52331f258bd5b3bd Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 24 Jun 2025 17:33:31 -0500 Subject: [PATCH 2/4] citrix_workspace: fix vm display crash Signed-off-by: Austin Horstman --- .../networking/remote/citrix-workspace/generic.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index d7a3050a3f76..e697ea095697 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -34,6 +34,7 @@ gtk_engines, freetype, dconf, + libGL, libpng12, libxml2, libjpeg, @@ -185,6 +186,7 @@ stdenv.mkDerivation rec { xorg.libXtst zlib sane-backends + libGL ]; runtimeDependencies = [ @@ -204,6 +206,7 @@ stdenv.mkDerivation rec { xorg.libxcb xorg.xprop xorg.xdpyinfo + libGL ]; installPhase = From 0c20b470fe59cdc7e0dde784e74d656eb6a66d9e Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 24 Jun 2025 17:35:04 -0500 Subject: [PATCH 3/4] citrix_workspace: sort dependencies Signed-off-by: Austin Horstman --- .../remote/citrix-workspace/generic.nix | 100 +++++++++--------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index e697ea095697..8837d934326e 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -5,59 +5,59 @@ makeWrapper, autoPatchelfHook, wrapGAppsHook3, - which, - more, - file, - atk, alsa-lib, + atk, + cacert, cairo, + dconf, + fetchurl, + file, fontconfig, + freetype, gdk-pixbuf, glib, - webkitgtk_4_0, + glib-networking, + gnome2, + gtk2, gtk2-x11, gtk3, + gtk_engines, heimdal, krb5, + libGL, + libappindicator-gtk3, + libcanberra-gtk3, + libcap, + libcxx, + libfaketime, + libgbm, + libinput, + libjpeg, + libjson, + libpng12, + libpulseaudio, + libredirect, + libsecret, libsoup_2_4, libvorbis, - speex, - openssl, - zlib, - xorg, - pango, - gtk2, - gnome2, - libgbm, - nss, - nspr, - gtk_engines, - freetype, - dconf, - libGL, - libpng12, libxml2, - libjpeg, - libredirect, - tzdata, - cacert, - systemd, - libcxx, - symlinkJoin, - libpulseaudio, - pcsclite, - glib-networking, llvmPackages, + more, + nspr, + nss, opencv4, - libfaketime, - libinput, - libcap, - libjson, - libsecret, - libcanberra-gtk3, + openssl, + pango, + pcsclite, sane-backends, - fetchurl, - libappindicator-gtk3, + speex, + symlinkJoin, + systemd, + tzdata, + webkitgtk_4_0, + which, + xorg, + zlib, homepage, version, @@ -133,11 +133,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook file + libfaketime makeWrapper more which wrapGAppsHook3 - libfaketime ]; buildInputs = [ @@ -148,18 +148,19 @@ stdenv.mkDerivation rec { fontconfig freetype gdk-pixbuf - gnome2.gtkglext glib-networking - webkitgtk_4_0 + gnome2.gtkglext gtk2 gtk2-x11 gtk3 gtk_engines heimdal krb5 - libcap + libGL libcanberra-gtk3 + libcap libcxx + libgbm libinput libjpeg libjson @@ -170,30 +171,30 @@ stdenv.mkDerivation rec { libvorbis libxml2' llvmPackages.libunwind - libgbm nspr nss opencv4' openssl' pango pcsclite + sane-backends speex - (lib.getLib systemd) stdenv.cc.cc + (lib.getLib systemd) + webkitgtk_4_0 + xorg.libXScrnSaver xorg.libXaw xorg.libXmu - xorg.libXScrnSaver xorg.libXtst zlib - sane-backends - libGL ]; runtimeDependencies = [ glib glib-networking - pcsclite libappindicator-gtk3 + libGL + pcsclite xorg.libX11 xorg.libXScrnSaver @@ -204,9 +205,8 @@ stdenv.mkDerivation rec { xorg.libXrender xorg.libXtst xorg.libxcb - xorg.xprop xorg.xdpyinfo - libGL + xorg.xprop ]; installPhase = From 884e805a88fa492c387b56e2bfdf1410ca4a0c15 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 24 Jun 2025 23:08:56 -0500 Subject: [PATCH 4/4] citrix_workspace: add glib-networking gio extra module Fixes `install glib-networking` message on `selfservice.desktop` aka `Citrix Workspace` desktop item. Signed-off-by: Austin Horstman --- pkgs/applications/networking/remote/citrix-workspace/generic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 8837d934326e..f0210e97a8ab 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -223,6 +223,7 @@ stdenv.mkDerivation rec { wrapProgram $out/opt/citrix-icaclient/${program} \ ${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" \ --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"