diff options
Diffstat (limited to 'pkgs/applications/networking/remote')
4 files changed, 19 insertions, 20 deletions
diff --git a/pkgs/applications/networking/remote/nice-dcv-client/default.nix b/pkgs/applications/networking/remote/nice-dcv-client/default.nix index 82debe6f8a1..20b85032887 100644 --- a/pkgs/applications/networking/remote/nice-dcv-client/default.nix +++ b/pkgs/applications/networking/remote/nice-dcv-client/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , glib , libX11 @@ -16,22 +17,23 @@ , gtk3 , libselinux , libxml2 +, libffi , python3Packages , cpio , autoPatchelfHook +, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "nice-dcv-client"; - version = "2020.2.1737-1"; - + version = "2021.2.3797-1"; src = fetchurl { - url = "https://d1uj6qtbmh3dt5.cloudfront.net/2020.2/Clients/nice-dcv-viewer-${version}.el8.x86_64.rpm"; - sha256 = "sha256-SUpfHd/Btc07cfjc3zx5I5BiNatr/c4E2/mfJuU4R1E="; + url = "https://d1uj6qtbmh3dt5.cloudfront.net/2021.2/Clients/nice-dcv-viewer-${version}.el8.x86_64.rpm"; + sha256 = "sha256-iLz25SB5v7ghkAZOMGPmpNaPihd8ikzCQS//r1xBNRU="; }; - nativeBuildInputs = [ autoPatchelfHook python3Packages.rpm ]; + nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook python3Packages.rpm ]; unpackPhase = '' rpm2cpio $src | ${cpio}/bin/cpio -idm ''; @@ -57,31 +59,28 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin/ mkdir -p $out/lib64/ - mv usr/bin/dcvviewer $out/bin/dcvviewer mv usr/lib64/* $out/lib64/ - mkdir -p $out/libexec/dcvviewer mv usr/libexec/dcvviewer/dcvviewer $out/libexec/dcvviewer/dcvviewer patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ $out/libexec/dcvviewer/dcvviewer - # Fix the wrapper script to have the right basedir. sed -i "s#basedir=/usr#basedir=$out#" $out/bin/dcvviewer - mv usr/share $out/ + ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas - # broken symlink, seems to give a warning message if i don't delete it - rm $out/lib64/dcvviewer/gio/modules/libdconfsettings.so + # we already ship libffi.so.7 + ln -s ${lib.getLib libffi}/lib/libffi.so $out/lib64/libffi.so.6 ''; meta = with lib; { description = "High-performance remote display protocol"; homepage = "https://aws.amazon.com/hpc/dcv/"; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ rmcgibbo ]; }; } diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 158f2aa327e..f292adfa427 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "teamviewer"; - version = "15.22.3"; + version = "15.24.5"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "15fvzhdq7mnx2l2w4byvij8ww16qwdlkbadal60rm66yzv79mv9w"; + sha256 = "sha256-u4azVjwD5xTc0vWe8tDEx44rBdYFZljZPVQ0yilqeR0="; }; unpackPhase = '' diff --git a/pkgs/applications/networking/remote/waypipe/default.nix b/pkgs/applications/networking/remote/waypipe/default.nix index eb1ec40cc15..8bde51d8937 100644 --- a/pkgs/applications/networking/remote/waypipe/default.nix +++ b/pkgs/applications/networking/remote/waypipe/default.nix @@ -4,15 +4,15 @@ }: stdenv.mkDerivation rec { - pname = "waypipe-unstable"; - version = "0.8.1"; + pname = "waypipe"; + version = "0.8.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mstoeckl"; repo = "waypipe"; rev = "v${version}"; - sha256 = "1v08dv3dfz420v51ahz7qgv3429073kmgrf8f66s4c3jlpch2pa1"; + sha256 = "02q8l1qaahmd41h6v3r46akh7xlqz7fpwwsy15qww4jdvypg6vg4"; }; nativeBuildInputs = [ meson ninja pkg-config scdoc ]; diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix index f5641c762ec..21244a1859b 100644 --- a/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/pkgs/applications/networking/remote/wayvnc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wayvnc"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "0q48fgh6gf3jicy4bk3kq18h9lhqfq9qz32ri6j9ffvbb8mcw64s"; + sha256 = "0cws9jfnmxqycmlyllvvqzw4jsbrwwk10v9gy8wifv3c61rwgdkk"; }; nativeBuildInputs = [ meson pkg-config ninja scdoc wayland-scanner ]; |