diff options
author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2017-03-25 14:12:28 +0000 |
---|---|---|
committer | obadz <obadz-git@obadz.com> | 2017-03-26 14:28:54 +0100 |
commit | 7035325c6243f5630fb8ca823f861057b2ee40d1 (patch) | |
tree | 4d54f3eac04b782181635337f2e0e425cbdba1af /pkgs/applications/networking/remote | |
parent | 6c17ad677c4970c87e8562574ea7e6fbf12b0813 (diff) | |
download | nixlib-7035325c6243f5630fb8ca823f861057b2ee40d1.tar nixlib-7035325c6243f5630fb8ca823f861057b2ee40d1.tar.gz nixlib-7035325c6243f5630fb8ca823f861057b2ee40d1.tar.bz2 nixlib-7035325c6243f5630fb8ca823f861057b2ee40d1.tar.lz nixlib-7035325c6243f5630fb8ca823f861057b2ee40d1.tar.xz nixlib-7035325c6243f5630fb8ca823f861057b2ee40d1.tar.zst nixlib-7035325c6243f5630fb8ca823f861057b2ee40d1.zip |
citrix-receiver: fix wrapper, direct dl url, $PWD needs escaping
(edited by @obadz, closes #24320)
Diffstat (limited to 'pkgs/applications/networking/remote')
-rw-r--r-- | pkgs/applications/networking/remote/citrix-receiver/default.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index cf7afc37b8bb..c656ff24df84 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -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" \ |