diff --git a/pkgs/applications/networking/remote/nice-dcv-client/default.nix b/pkgs/applications/networking/remote/nice-dcv-client/default.nix index 82debe6f8a1a..20b850328875 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 ]; }; }