git.iko.soy/typeable/nixpkgs
on master help sign in
citrix_workspace: remove attributes for old versions; fix i686 build
commit93a00bec3e51e9a484468e1d3c9a68886d5c6fc0 authorMaximilian Bosch <maximilian@mbosch.me> dateFri 30 Oct 2020, 18:33 (6 years ago) parent2a9e333
3 files changed+5−9
compare with master
unifiedsplit
pkgs/applications/networking/remote/citrix-workspace/generic.nix+4−4 pkgs/applications/networking/remote/citrix-workspace/sources.nix+1−1 pkgs/top-level/all-packages.nix−4
pkgs/applications/networking/remote/citrix-workspace/generic.nix+4−4
@@ -146,8 +146,8 @@ stdenv.mkDerivation rec {
146146 export HOME=$(mktemp -d)
147147
148148 # Run upstream installer in the store-path.
149− sed -i -e 's,^ANSWER="",ANSWER="$INSTALLER_YES",g' -e 's,/bin/true,true,g' ./linuxx64/hinst
150− ${stdenv.shell} linuxx64/hinst CDROM "$(pwd)"
149+ sed -i -e 's,^ANSWER="",ANSWER="$INSTALLER_YES",g' -e 's,/bin/true,true,g' ./${prefix}/hinst
150+ ${stdenv.shell} ${prefix}/hinst CDROM "$(pwd)"
151151
152152 if [ -f "$ICAInstDir/util/setlog" ]; then
153153 chmod +x "$ICAInstDir/util/setlog"
@@ -169,8 +169,8 @@ stdenv.mkDerivation rec {
169169
170170 # See https://developer-docs.citrix.com/projects/workspace-app-for-linux-oem-guide/en/latest/reference-information/#library-files
171171 # Those files are fallbacks to support older libwekit.so and libjpeg.so
172− rm $out/opt/citrix-icaclient/lib/ctxjpeg_fb_8.so
173− rm $out/opt/citrix-icaclient/lib/UIDialogLibWebKit.so
172+ rm $out/opt/citrix-icaclient/lib/ctxjpeg_fb_8.so || true
173+ rm $out/opt/citrix-icaclient/lib/UIDialogLibWebKit.so || true
174174
175175 # We support only Gstreamer 1.0
176176 rm $ICAInstDir/util/{gst_aud_{play,read},gst_*0.10,libgstflatstm0.10.so}
pkgs/applications/networking/remote/citrix-workspace/sources.nix+1−1
@@ -52,7 +52,7 @@ let
5252 #
5353 # The lifespans of Citrix products can be found here:
5454 # https://www.citrix.com/support/product-lifecycle/milestones/receiver.html
55− unsupportedVersions = [ "19.6.0" "19.8.0" "19.10.0" "19.12.0" ];
55+ unsupportedVersions = [ ];
5656in {
5757 inherit supportedVersions unsupportedVersions;
5858}
pkgs/top-level/all-packages.nix−4
@@ -2857,10 +2857,6 @@ in
28572857 citrix_workspace = citrix_workspace_20_09_0;
28582858
28592859 inherit (callPackage ../applications/networking/remote/citrix-workspace { })
2860− citrix_workspace_19_6_0
2861− citrix_workspace_19_8_0
2862− citrix_workspace_19_10_0
2863− citrix_workspace_19_12_0
28642860 citrix_workspace_20_04_0
28652861 citrix_workspace_20_06_0
28662862 citrix_workspace_20_09_0