From 7e8e71f73e37c2979b7d468917c7698b97f5300c Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Sun, 15 Nov 2020 16:43:17 -0500 Subject: [PATCH 1/2] nice-dcv-client: init at 2020.2.1737-1 --- .../remote/nice-dcv-client/default.nix | 87 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 89 insertions(+) create mode 100644 pkgs/applications/networking/remote/nice-dcv-client/default.nix diff --git a/pkgs/applications/networking/remote/nice-dcv-client/default.nix b/pkgs/applications/networking/remote/nice-dcv-client/default.nix new file mode 100644 index 000000000000..19e65c0bdb3d --- /dev/null +++ b/pkgs/applications/networking/remote/nice-dcv-client/default.nix @@ -0,0 +1,87 @@ +{ stdenv +, fetchurl +, glib +, libX11 +, gst_all_1 +, sqlite +, epoxy +, pango +, cairo +, gdk-pixbuf +, e2fsprogs +, libkrb5 +, libva +, openssl +, pcsclite +, gtk3 +, libselinux +, libxml2 +, python3Packages +, cpio +, autoPatchelfHook +}: + +stdenv.mkDerivation rec { + pname = "nice-dcv-client"; + version = "2020.2.1737-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="; + }; + + nativeBuildInputs = [ autoPatchelfHook python3Packages.rpm ]; + unpackPhase = '' + rpm2cpio $src | ${cpio}/bin/cpio -idm + ''; + + buildInputs = [ + libselinux + libkrb5 + libxml2 + libva + e2fsprogs + libX11 + openssl + pcsclite + gtk3 + cairo + epoxy + pango + gdk-pixbuf + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ]; + + 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 + ''; + + meta = with stdenv.lib; { + description = "High-performance remote display protocol"; + homepage = "https://aws.amazon.com/hpc/dcv/"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ rmcgibbo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 460a9e39e4f5..8589df069dc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22580,6 +22580,8 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix { geoip = geoipWithDatabase; }; + nice-dcv-client = callPackage ../applications/networking/remote/nice-dcv-client { }; + nixos-shell = callPackage ../tools/virtualization/nixos-shell {}; noaa-apt = callPackage ../applications/radio/noaa-apt { }; From 833c76d138bebcdafa03ebf623b1575ab2c3018c Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Mon, 7 Dec 2020 09:51:36 -0500 Subject: [PATCH 2/2] maintainers: add rmcgibbo --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2838f60ad003..383d21c08d9d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7403,6 +7403,12 @@ githubId = 13752145; name = "Richard Lupton"; }; + rmcgibbo = { + email = "rmcgibbo@gmail.com"; + github = "rmcgibbo"; + githubId = 641278; + name = "Robert T. McGibbon"; + }; rnhmjoj = { email = "rnhmjoj@inventati.org"; github = "rnhmjoj";