dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #44522 from Ma27/allow-citrix-custom-certs

Browse Source 
citrix_receiver: allow custom certs and hooks for the installation
This commit is contained in:
Jörg Thalheim 2018-08-07 01:29:49 +01:00 committed by GitHub
commit 893b080e56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 46 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
pkgs/applications/networking/remote/citrix-receiver/default.nix
View File

@ -39,50 +39,6 @@ let
}); });
versionInfo = { versionInfo = {
"13.4.0" = rec {
major = "13";
minor = "4";
patch = "0";
x64hash = "133brs0sq6d0mgr19rc6ig1n9ahm3ryi23v5nrgqfh0hgxqcrrjb";
x86hash = "0r7jfl5yqv1s2npy8l9gsn0gbb82f6raa092ppkc8xy5pni5sh7l";
x64suffix = "10109380";
x86suffix = x64suffix;
homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-latest-13-4.html;
};
"13.5.0" = rec {
major = "13";
minor = "5";
patch = "0";
x64hash = "1r24mhkpcc0z95n597p07fz92pd1b8qqzp2z6w07rmb9wb8mpd4x";
x86hash = "0pwxshlryzhkl86cj9ryybm54alhzjx0gpp67fnvdn5r64wy1nd1";
x64suffix = "10185126";
x86suffix = x64suffix;
homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-latest-13-5.html;
};
"13.6.0" = rec {
major = "13";
minor = "6";
patch = "0";
x64hash = "6e423be41d5bb8186bcca3fbb4ede54dc3f00b8d2aeb216ae4aabffef9310d34";
x86hash = "0ba3eba208b37844904d540b3011075ed5cecf429a0ab6c6cd52f2d0fd841ad2";
x64suffix = "10243651";
x86suffix = x64suffix;
homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-136.html;
};
"13.7.0" = {
major = "13";
minor = "7";
patch = "0";
x64hash = "18fb374b9fb8e249b79178500dddca7a1f275411c6537e7695da5dcf19c5ba91";
x86hash = "4c68723b0327cf6f12da824056fce2b7853c38e6163a48c9d222b93dd8da75b6";
x64suffix = "10276927";
x86suffix = "10276925";
homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-137.html;
};
"13.8.0" = { "13.8.0" = {
major = "13"; major = "13";
minor = "8"; minor = "8";
@ -156,7 +112,7 @@ let
''; '';
}; };
phases = [ "unpackPhase" "installPhase" ]; dontBuild = true;
sourceRoot = "."; sourceRoot = ".";
@ -203,6 +159,8 @@ let
}; };
installPhase = '' installPhase = ''
runHook preInstall
export ICAInstDir="$out/opt/citrix-icaclient" export ICAInstDir="$out/opt/citrix-icaclient"
sed -i \ sed -i \
@ -262,13 +220,15 @@ let
# We introduce a dependency on the source file so that it need not be redownloaded everytime # We introduce a dependency on the source file so that it need not be redownloaded everytime
echo $src >> "$out/share/nix_dependencies.pin" echo $src >> "$out/share/nix_dependencies.pin"
runHook postInstall
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
inherit homepage; inherit homepage;
description = "Citrix Receiver"; description = "Citrix Receiver";
maintainers = with maintainers; [ obadz a1russell ]; maintainers = with maintainers; [ obadz a1russell ma27 ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
}; };

19
pkgs/applications/networking/remote/citrix-receiver/wrapper.nix Normal file
View File

@ -0,0 +1,19 @@
{ citrix_receiver, extraCerts ? [], symlinkJoin }:
let
mkCertCopy = certPath:
"cp ${certPath} $out/opt/citrix-icaclient/keystore/cacerts/";
in
if builtins.length extraCerts == 0 then citrix_receiver else symlinkJoin {
name = "citrix-with-extra-certs-${citrix_receiver.version}";
paths = [ citrix_receiver ];
postBuild = ''
${builtins.concatStringsSep "\n" (map mkCertCopy extraCerts)}
sed -i -E "s,-icaroot (.+citrix-icaclient),-icaroot $out/opt/citrix-icaclient," $out/bin/wfica
'';
}

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

@ -1731,15 +1731,27 @@ with pkgs;
circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; circleci-cli = callPackage ../development/tools/misc/circleci-cli { };
citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { }; citrix_receiver_unwrapped = callPackage ../applications/networking/remote/citrix-receiver { };
citrix_receiver_13_10_0 = citrix_receiver.override { version = "13.10.0"; }; citrix_receiver_unwrapped_13_10_0 = citrix_receiver_unwrapped.override { version = "13.10.0"; };
citrix_receiver_13_9_1 = citrix_receiver.override { version = "13.9.1"; }; citrix_receiver_unwrapped_13_9_1 = citrix_receiver_unwrapped.override { version = "13.9.1"; };
citrix_receiver_13_9_0 = citrix_receiver.override { version = "13.9.0"; }; citrix_receiver_unwrapped_13_9_0 = citrix_receiver_unwrapped.override { version = "13.9.0"; };
citrix_receiver_13_8_0 = citrix_receiver.override { version = "13.8.0"; }; citrix_receiver_unwrapped_13_8_0 = citrix_receiver_unwrapped.override { version = "13.8.0"; };
citrix_receiver_13_7_0 = citrix_receiver.override { version = "13.7.0"; };
citrix_receiver_13_6_0 = citrix_receiver.override { version = "13.6.0"; }; citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver/wrapper.nix {
citrix_receiver_13_5_0 = citrix_receiver.override { version = "13.5.0"; }; citrix_receiver = citrix_receiver_unwrapped;
citrix_receiver_13_4_0 = citrix_receiver.override { version = "13.4.0"; }; };
citrix_receiver_13_10_0 = callPackage ../applications/networking/remote/citrix-receiver/wrapper.nix {
citrix_receiver = citrix_receiver_unwrapped_13_10_0;
};
citrix_receiver_13_9_1 = callPackage ../applications/networking/remote/citrix-receiver/wrapper.nix {
citrix_receiver = citrix_receiver_unwrapped_13_9_1;
};
citrix_receiver_13_9_0 = callPackage ../applications/networking/remote/citrix-receiver/wrapper.nix {
citrix_receiver = citrix_receiver_unwrapped_13_9_0;
};
citrix_receiver_13_8_0 = callPackage ../applications/networking/remote/citrix-receiver/wrapper.nix {
citrix_receiver = citrix_receiver_unwrapped_13_8_0;
};
citra = libsForQt5.callPackage ../misc/emulators/citra { }; citra = libsForQt5.callPackage ../misc/emulators/citra { };