From 56315519c95b5f598f933127d1e087be08bb48d1 Mon Sep 17 00:00:00 2001
From: jackyliu16 <18922251299@163.com>
Date: Mon, 17 Apr 2023 20:29:01 +0800
Subject: [PATCH 1/2] maintainers: add onedragon

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9ea2f578de3a..a14bf347e6bc 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11506,6 +11506,12 @@
     githubId = 1538622;
     name = "Michael Reilly";
   };
+  onedragon = {
+    name = "YiLong Liu";
+    email = "18922251299@163.com";
+    github = "jackyliu16";
+    githubId = 50787361;
+  };
   onixie = {
     email = "onixie@gmail.com";
     github = "onixie";

From 79d5a53953b33598f9b29fef6ca296f5f8597b09 Mon Sep 17 00:00:00 2001
From: jackyliu16 <18922251299@163.com>
Date: Mon, 17 Apr 2023 20:33:28 +0800
Subject: [PATCH 2/2] realvnc-vnc-viewer: 6.22.515 -> 7.1.0

  1. update x86_64-linux rpm packages
  2. remove Unsupported i686-linux rpm packages
  3. add buildInputs stdenv.cc.cc.libgcc
    ref: https://github.com/NixOS/nixpkgs/issues/225963
---
 .../admin/realvnc-vnc-viewer/default.nix      | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix
index f7a8f7ca92f4..e6f60459bfbd 100644
--- a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix
+++ b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix
@@ -1,22 +1,25 @@
-{ lib, stdenv, fetchurl, autoPatchelfHook, rpmextract, libX11, libXext }:
+{ lib
+, stdenv
+, fetchurl
+, autoPatchelfHook
+, rpmextract
+, libX11
+, libXext
+}:
 
 stdenv.mkDerivation rec {
   pname = "realvnc-vnc-viewer";
-  version = "6.22.515";
+  version = "7.1.0";
 
   src = {
     "x86_64-linux" = fetchurl {
-      url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm";
-      sha256 = "1l9kfmb1695pv2v9hm8z5yr7y5yhadbbs61s4yf9ksvvfypzwrpn";
-    };
-    "i686-linux" = fetchurl {
-      url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x86.rpm";
-      sha256 = "15fi1siwbsxmy7qi6f8r8ym346a8mx3kqcp9mvwvx39wm3ija6dh";
+      url = "https://downloads.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm";
+      sha256 = "sha256-Mn4K2HICK7owHcXH85IJUncnpPZ56zNybkHZNiqYkHY=";
     };
   }.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
   nativeBuildInputs = [ autoPatchelfHook rpmextract ];
-  buildInputs = [ libX11 libXext ];
+  buildInputs = [ libX11 libXext stdenv.cc.cc.libgcc or null ];
 
   unpackPhase = ''
     rpmextract $src
@@ -47,7 +50,7 @@ stdenv.mkDerivation rec {
       url = "https://static.realvnc.com/media/documents/LICENSE-4.0a_en.pdf";
       free = false;
     };
-    maintainers = with maintainers; [ emilytrau ];
-    platforms = [ "x86_64-linux" "i686-linux" ];
+    maintainers = with maintainers; [ emilytrau onedragon ];
+    platforms = [ "x86_64-linux" ];
   };
 }