diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/applications/networking/remote')
5 files changed, 36 insertions, 17 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix index a2ad8b8129a6..c0dc438daacd 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -3,6 +3,7 @@ , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin +, libpulseaudio, pcsclite , homepage, version, prefix, hash @@ -97,10 +98,12 @@ stdenv.mkDerivation rec { xorg.libXScrnSaver xorg.libXtst zlib - ] ++ lib.optional (lib.versionOlder version "20.04") e2fsprogs; + ] ++ lib.optional (lib.versionOlder version "20.04") e2fsprogs + ++ lib.optional (lib.versionAtLeast version "20.10") libpulseaudio; runtimeDependencies = [ glib + pcsclite xorg.libX11 xorg.libXScrnSaver @@ -146,8 +149,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 +172,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} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix index abdd54f4af6e..bbeed5b779c2 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -43,6 +43,17 @@ let x86hash = "1b4gdmnnpa61ydiv2fnmap8cnfhskrq6swcs6i1nqrp5zvvkqrv4"; x64suffix = "15"; x86suffix = "15"; + homepage = "https://www.citrix.com/de-de/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2009.html"; + }; + + "20.10.0" = { + major = "20"; + minor = "10"; + patch = "0"; + x64hash = "13g7r92mhwqwqkm6a4k4yn232ighkmxifs7j8wdi1yva0dvklqdf"; + x86hash = "04cr2da25v8x098ccyjwa47d4krk3jpldqkyf4kk2j3hwzbqh9yx"; + x64suffix = "6"; + x86suffix = "6"; homepage = "https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; @@ -52,7 +63,7 @@ let # # The lifespans of Citrix products can be found here: # https://www.citrix.com/support/product-lifecycle/milestones/receiver.html - unsupportedVersions = [ "19.6.0" "19.8.0" "19.10.0" "19.12.0" ]; + unsupportedVersions = [ ]; in { inherit supportedVersions unsupportedVersions; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix index 52f8decf170f..a81356da252d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix @@ -1,9 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, alsaLib, ffmpeg_3, glib, openssl +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, alsaLib, ffmpeg, glib, openssl , pcre, zlib, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama , libXrandr, libXrender, libXv, libXtst, libxkbcommon, libxkbfile, wayland -, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt -, libusb1, libpulseaudio ? null, cups ? null, pcsclite ? null, systemd ? null -, buildServer ? true, nocaps ? false }: +, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt, cairo +, libusb1, libpulseaudio, cups, pcsclite, systemd, libjpeg_turbo +, buildServer ? true, nocaps ? false +}: let cmFlag = flag: if flag then "ON" else "OFF"; @@ -49,8 +50,9 @@ in stdenv.mkDerivation rec { buildInputs = with lib; [ alsaLib + cairo cups - ffmpeg_3 + ffmpeg glib gst-plugins-base gst-plugins-good @@ -65,6 +67,7 @@ in stdenv.mkDerivation rec { libXrender libXtst libXv + libjpeg_turbo libpulseaudio libunwind libusb1 @@ -93,6 +96,9 @@ in stdenv.mkDerivation rec { WITH_PULSE = (libpulseaudio != null); WITH_SERVER = buildServer; WITH_SSE2 = stdenv.isx86_64; + WITH_VAAPI = true; + WITH_JPEG = (libjpeg_turbo != null); + WITH_CAIRO = (cairo != null); }; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix index 0393a5bdeb83..2c91d6496a0e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitLab , meson, ninja, pkg-config, scdoc -, wayland, wayland-protocols, openssh +, openssh , mesa, lz4, zstd, ffmpeg, libva }: stdenv.mkDerivation rec { pname = "waypipe-unstable"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mstoeckl"; repo = "waypipe"; rev = "v${version}"; - sha256 = "0bkmibask7gfnwkn3fg3l6zaabp95n1zsdnz3dwng8j80a0kakyy"; + sha256 = "00skyxmbssfxksb8wlqdr8gajpysadirjcn230fd5gaf5msvllx7"; }; postPatch = '' @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ - wayland wayland-protocols # Optional dependencies: mesa lz4 zstd ffmpeg libva ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix index f69d2326217d..1c20bd8b7a82 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, perlPackages, makeWrapper, perl, which, nx-libs -, utillinux, coreutils, glibc, gawk, gnused, gnugrep, findutils, xorg +, util-linux, coreutils, glibc, gawk, gnused, gnugrep, findutils, xorg , nettools, iproute, bc, procps, psmisc, lsof, pwgen, openssh, sshfs, bash }: @@ -30,7 +30,7 @@ let ]); binaryDeps = [ - perlEnv which nx-libs utillinux coreutils glibc.bin gawk gnused gnugrep + perlEnv which nx-libs util-linux coreutils glibc.bin gawk gnused gnugrep findutils nettools iproute bc procps psmisc lsof pwgen openssh sshfs xorg.xauth xorg.xinit xorg.xrandr xorg.xmodmap xorg.xwininfo xorg.fontutil xorg.xkbcomp xorg.setxkbmap |