citrix-receiver: fix wrapper, direct dl url, $PWD needs escaping

(edited by @obadz, closes #24320)
This commit is contained in:
Dmitry Kalinkin 2017-03-25 14:12:28 +00:00 committed by obadz
parent 6c17ad677c
commit 7035325c62

View File

@ -22,14 +22,15 @@
, alsaLib
}:
stdenv.mkDerivation rec {
let versionRec = { major = "13"; minor = "4"; patch = "0"; };
in stdenv.mkDerivation rec {
name = "citrix-receiver-${version}";
version = "13.4.0";
version = with versionRec; "${major}.${minor}.${patch}";
homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html;
prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86";
src = requireFile rec {
src = with versionRec; requireFile rec {
name = "${prefixWithBitness}-${version}.10109380.tar.gz";
sha256 =
if stdenv.is64bit
@ -41,12 +42,14 @@ stdenv.mkDerivation rec {
${homepage}
(if you do not find version ${version} there, try https://www.citrix.com/downloads/citrix-receiver/)
(if you do not find version ${version} there, try at
https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-latest-${major}-${minor}.html
or at https://www.citrix.com/downloads/citrix-receiver/ under "Earlier Versions of Receiver for Linux")
Once you have downloaded the file, please use the following command and re-run the
installation:
nix-prefetch-url file://$PWD/${name}
nix-prefetch-url file://\$PWD/${name}
'';
};
@ -135,7 +138,8 @@ stdenv.mkDerivation rec {
echo "Wrapping wfica..."
mkdir "$out/bin"
makeWrapper "$ICAInstDir/wfica -icaroot $ICAInstDir" "$out/bin/wfica" \
makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \
--add-flags "-icaroot $ICAInstDir" \
--set ICAROOT "$ICAInstDir" \
--set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \