public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

citrix_workspace: remove attributes for old versions; fix i686 build

Browse Source
This commit is contained in:
Maximilian Bosch 2020-10-30 18:33:35 +01:00
parent 2a9e33374b
commit 93a00bec3e
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/remote/citrix-workspace/generic.nix
View File

@ -146,8 +146,8 @@ stdenv.mkDerivation rec {
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
# Run upstream installer in the store-path. # 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' ./${prefix}/hinst
${stdenv.shell} linuxx64/hinst CDROM "$(pwd)" ${stdenv.shell} ${prefix}/hinst CDROM "$(pwd)"
if [ -f "$ICAInstDir/util/setlog" ]; then if [ -f "$ICAInstDir/util/setlog" ]; then
chmod +x "$ICAInstDir/util/setlog" chmod +x "$ICAInstDir/util/setlog"
@ -169,8 +169,8 @@ stdenv.mkDerivation rec {
# See https://developer-docs.citrix.com/projects/workspace-app-for-linux-oem-guide/en/latest/reference-information/#library-files # See https://developer-docs.citrix.com/projects/workspace-app-for-linux-oem-guide/en/latest/reference-information/#library-files
# Those files are fallbacks to support older libwekit.so and libjpeg.so # Those files are fallbacks to support older libwekit.so and libjpeg.so
rm $out/opt/citrix-icaclient/lib/ctxjpeg_fb_8.so rm $out/opt/citrix-icaclient/lib/ctxjpeg_fb_8.so || true
rm $out/opt/citrix-icaclient/lib/UIDialogLibWebKit.so rm $out/opt/citrix-icaclient/lib/UIDialogLibWebKit.so || true
# We support only Gstreamer 1.0 # 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}

2
pkgs/applications/networking/remote/citrix-workspace/sources.nix
View File

@ -52,7 +52,7 @@ let
# #
# The lifespans of Citrix products can be found here: # The lifespans of Citrix products can be found here:
# https://www.citrix.com/support/product-lifecycle/milestones/receiver.html # https://www.citrix.com/support/product-lifecycle/milestones/receiver.html
unsupportedVersions = [ "19.6.0" "19.8.0" "19.10.0" "19.12.0" ]; unsupportedVersions = [ ];
in { in {
inherit supportedVersions unsupportedVersions; inherit supportedVersions unsupportedVersions;
} }

4
pkgs/top-level/all-packages.nix
View File

@ -2857,10 +2857,6 @@ in
citrix_workspace = citrix_workspace_20_09_0; citrix_workspace = citrix_workspace_20_09_0;
inherit (callPackage ../applications/networking/remote/citrix-workspace { }) inherit (callPackage ../applications/networking/remote/citrix-workspace { })
citrix_workspace_19_6_0
citrix_workspace_19_8_0
citrix_workspace_19_10_0
citrix_workspace_19_12_0
citrix_workspace_20_04_0 citrix_workspace_20_04_0
citrix_workspace_20_06_0 citrix_workspace_20_06_0
citrix_workspace_20_09_0 citrix_workspace_20_09_0