diff --git a/doc/package-specific-user-notes.xml b/doc/package-specific-user-notes.xml
index ef9198d1de2..196c760251f 100644
--- a/doc/package-specific-user-notes.xml
+++ b/doc/package-specific-user-notes.xml
@@ -409,11 +409,19 @@ overrides = self: super: rec {
- Citrix Receiver
+ Citrix Receiver & Citrix Workspace App
- The Citrix
- Receiver is a remote desktop viewer which provides access to
+
+
+ Please note that the citrix_receiver package has been deprecated since its
+ development was discontinued by upstream
+ and will be replaced by the citrix workspace app.
+
+
+ Citrix Receiver and
+ Citrix Workspace App
+ are a remote desktop viewers which provide access to
XenDesktop
installations.
@@ -423,30 +431,35 @@ overrides = self: super: rec {
The tarball archive needs to be downloaded manually as the license
- agreements of the vendor need to be accepted first. This is available at
- the
- download
- page at citrix.com. Then run nix-prefetch-url
- file://$PWD/linuxx64-$version.tar.gz. With the archive available
+ agreements of the vendor for
+ Citrix Receiver
+ or Citrix Workspace
+ need to be accepted first.
+ Then run nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz.
+ With the archive available
in the store the package can be built and installed with Nix.
-
- Note: it's recommended to install Citrix
- Receiver using nix-env -i or globally to
- ensure that the .desktop files are installed properly
- into $XDG_CONFIG_DIRS. Otherwise it won't be possible to
- open .ica files automatically from the browser to start
- a Citrix connection.
-
+
+ Caution with <command>nix-shell</command> installs
+
+ It's recommended to install Citrix Receiver
+ and/or Citrix Workspace using
+ nix-env -i or globally to
+ ensure that the .desktop files are installed properly
+ into $XDG_CONFIG_DIRS. Otherwise it won't be possible to
+ open .ica files automatically from the browser to start
+ a Citrix connection.
+
+ Custom certificates
- The Citrix Receiver in nixpkgs trusts
- several certificates
+ The Citrix Receiver and Citrix Workspace App
+ in nixpkgs trust several certificates
from the
Mozilla database by default. However several companies using Citrix
might require their own corporate certificate. On distros with imperative
@@ -459,7 +472,7 @@ overrides = self: super: rec {
{ config.allowUnfree = true; };
let extraCerts = [ ./custom-cert-1.pem ./custom-cert-2.pem /* ... */ ]; in
-citrix_receiver.override {
+citrix_workspace.override { # the same applies for `citrix_receiver` if used.
inherit extraCerts;
}]]>
diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix
index 13a16a6e224..2c81a6e7df1 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/default.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix
@@ -22,22 +22,11 @@
, fontconfig
, gtk_engines
, alsaLib
-, libidn
, zlib
-, version ? "19.3.0"
+, version ? "19.6.0"
}:
let
- # In 56e1bdc7f9c (libidn: 1.34 -> 1.35), libidn.so.11 became libidn.so.12.
- # Citrix looks for the former so we build version 1.34 to please the binary
- libidn_134 = libidn.overrideDerivation (_: rec {
- name = "libidn-1.34";
- src = fetchurl {
- url = "mirror://gnu/libidn/${name}.tar.gz";
- sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p";
- };
- });
-
versionInfo = let
supportedVersions = {
"19.3.0" = {
@@ -48,13 +37,27 @@ let
x86hash = "1hxgj5lk5ghbpssbqjd404qr84gls967vwrh8ww5hg3pn86kyf8w";
x64suffix = "5";
x86suffix = "5";
+ homepage = https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1903.html;
+ };
+
+ "19.6.0" = {
+ major = "19";
+ minor = "6";
+ patch = "0";
+ x64hash = "0szqlfmigzgf0309i6ikxkizxaf4ri7qmhys75m0zi3bpwx6hzhs";
+ x86hash = "16v3kgavrh62z6vxcbw6mn7h0bfishpl7m92k7g1p2882r1f8vaf";
+ x64suffix = "60";
+ x86suffix = "60";
homepage = https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html;
};
};
# Copied this file largely from the citrix-receiver package
# Leaving this here even though there are no deprecations yet
- # for ease of future maintenance
+ # for ease of future maintenance.
+ #
+ # The lifespans of Citrix products can be found here:
+ # https://www.citrix.com/support/product-lifecycle/milestones/receiver.html
deprecatedVersions = let
versions = [ ];
in
@@ -117,7 +120,6 @@ let
xorg.libXinerama
xorg.libXfixes
libpng12
- libidn_134
zlib
gtk_engines
freetype
@@ -208,6 +210,7 @@ let
inherit homepage;
description = "Citrix Workspace";
platforms = platforms.linux;
+ maintainers = with maintainers; [ ma27 ];
};
};
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79388cefe84..9ff5f2daf70 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2149,11 +2149,15 @@ in
};
citrix_workspace_unwrapped = callPackage ../applications/networking/remote/citrix-workspace { };
+ citrix_workspace_unwrapped_19_6_0 = citrix_workspace_unwrapped.override { version = "19.6.0"; };
citrix_workspace_unwrapped_19_3_0 = citrix_workspace_unwrapped.override { version = "19.3.0"; };
citrix_workspace = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix {
citrix_workspace = citrix_workspace_unwrapped;
};
+ citrix_workspace_19_6_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix {
+ citrix_workspace = citrix_workspace_unwrapped_19_6_0;
+ };
citrix_workspace_19_3_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix {
citrix_workspace = citrix_workspace_unwrapped_19_3_0;
};