Skip to content

citrix-workspace: 24.5.0.76 -> 24.8.0.98 #360106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
symphorien merged 2 commits into from
Dec 2, 2024
Merged

citrix-workspace: 24.5.0.76 -> 24.8.0.98 #360106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2227975
citrix-workspace: add flacks
flacks Nov 29, 2024
d57718d
citrix-workspace: 24.5.0.76 -> 24.8.0.98
flacks Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions maintainers/maintainer-list.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7307,6 +7307,13 @@
github = "fkautz";
githubId = 135706;
};
flacks = {
name = "Jean Lucas";
email = "jean@4ray.co";
github = "flacks";
githubId = 2135469;
matrix = "@flacks:matrix.org";
};
FlafyDev = {
name = "Flafy Arazi";
email = "flafyarazi@gmail.com";
Expand Down
7 changes: 4 additions & 3 deletions pkgs/applications/networking/remote/citrix-workspace/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ let
paths = [ opencv4 ];
postBuild = ''
for so in ${opencv4}/lib/*.so; do
ln -s "$so" $out/lib/$(basename "$so").407
ln -s "$so" $out/lib/$(basename "$so").407 || true
ln -s "$so" $out/lib/$(basename "$so").410 || true
done
'';
};
Expand Down Expand Up @@ -201,7 +202,7 @@ stdenv.mkDerivation rec {
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}
rm $ICAInstDir/util/{gst_aud_{play,read},gst_*0.10,libgstflatstm0.10.so} || true

@SigmaSquadron SigmaSquadron Dec 2, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I'm understanding this correctly, some of these files no longer exist. Can the wildcard instead be altered so these files aren't passed to rm?

@flacks flacks Dec 2, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this package supports lots of older versions of Citrix (see sources.nix), I'm not sure if those are present in the older packages, hence the || true. I have not tested anything older than the last 2 releases as of this writing. I'm assuming some enterprises require older versions of Citrix to operate, given how slow businesses are to adopt newer versions sometimes. If those files are present for older Citrix versions, they may fail to launch. What should we do?

@SigmaSquadron SigmaSquadron Dec 2, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My question spawned from my ignorance about how the generic Citrix builder works. This makes sense, and it's fine the way it is.

@flacks flacks Dec 2, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It took me a good while to understand how this package works/builds. Hopefully it can be cleaned up more in the future :)

ln -sf $ICAInstDir/util/gst_play1.0 $ICAInstDir/util/gst_play
ln -sf $ICAInstDir/util/gst_read1.0 $ICAInstDir/util/gst_read

Expand Down Expand Up @@ -238,7 +239,7 @@ stdenv.mkDerivation rec {
description = "Citrix Workspace";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = [ "x86_64-linux" ] ++ optional (versionOlder version "24") "i686-linux";
maintainers = [ ];
maintainers = with maintainers; [ flacks ];
inherit homepage;
};
}
11 changes: 11 additions & 0 deletions pkgs/applications/networking/remote/citrix-workspace/sources.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,17 @@ let
x86suffix = "";
homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
};

"24.08.0" = {
major = "24";
minor = "8";
patch = "0";
x64hash = "1jb22n6gcv4pv8khg98sv663yfpi47dpkvqgifbhps98iw5zrkbp";
x86hash = "";
x64suffix = "98";
x86suffix = "";
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
Expand Down
3 changes: 2 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2860,8 +2860,9 @@ with pkgs;
citrix_workspace_23_11_0
citrix_workspace_24_02_0
citrix_workspace_24_05_0
citrix_workspace_24_08_0
;
citrix_workspace = citrix_workspace_24_05_0;
citrix_workspace = citrix_workspace_24_08_0;

cmst = libsForQt5.callPackage ../tools/networking/cmst { };

Expand Down