From 93a00bec3e51e9a484468e1d3c9a68886d5c6fc0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 30 Oct 2020 18:33:35 +0100 Subject: citrix_workspace: remove attributes for old versions; fix i686 build --- pkgs/applications/networking/remote/citrix-workspace/generic.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/networking/remote/citrix-workspace/generic.nix') diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index a2ad8b8129a..19165184d25 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -146,8 +146,8 @@ stdenv.mkDerivation rec { export HOME=$(mktemp -d) # Run upstream installer in the store-path. - sed -i -e 's,^ANSWER="",ANSWER="$INSTALLER_YES",g' -e 's,/bin/true,true,g' ./linuxx64/hinst - ${stdenv.shell} linuxx64/hinst CDROM "$(pwd)" + sed -i -e 's,^ANSWER="",ANSWER="$INSTALLER_YES",g' -e 's,/bin/true,true,g' ./${prefix}/hinst + ${stdenv.shell} ${prefix}/hinst CDROM "$(pwd)" if [ -f "$ICAInstDir/util/setlog" ]; then 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 # 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/UIDialogLibWebKit.so + rm $out/opt/citrix-icaclient/lib/ctxjpeg_fb_8.so || true + 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} -- cgit 1.4.1