From 43aa4e69825672c87456788d5a5bd8119cf06f37 Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Thu, 22 May 2025 20:26:31 +0200
Subject: [PATCH 1/4] tigervnc: broken on darwin

See also https://github.com/TigerVNC/tigervnc/issues/877 .

From reading

https://github.com/TigerVNC/tigervnc/issues/877

tigervnc is supposed to build on Darwin platform,
so we set the `broken` flag to indicate something's wrong here.
---
 pkgs/by-name/ti/tigervnc/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ti/tigervnc/package.nix b/pkgs/by-name/ti/tigervnc/package.nix
index 92853c15b8ed..c4f967f87a43 100644
--- a/pkgs/by-name/ti/tigervnc/package.nix
+++ b/pkgs/by-name/ti/tigervnc/package.nix
@@ -194,6 +194,7 @@ stdenv.mkDerivation rec {
     description = "Fork of tightVNC, made in cooperation with VirtualGL";
     maintainers = [ ];
     platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin;
     # Prevent a store collision.
     priority = 4;
   };

From 04f2c64b1df9611df6c999e0a150429cd28c3ff0 Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Tue, 20 May 2025 11:58:41 +0200
Subject: [PATCH 2/4] tigervnc: use `tag` and `hash` in `fetchFromGitHub`

* `sha256` -> `hash`
* `rev` -> `tag`, inspired by
  https://github.com/NixOS/nixpkgs/commit/cb9f9a1e5a51a87d59b373db7016cee1608debd5
---
 pkgs/by-name/ti/tigervnc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ti/tigervnc/package.nix b/pkgs/by-name/ti/tigervnc/package.nix
index c4f967f87a43..57a81c4545d8 100644
--- a/pkgs/by-name/ti/tigervnc/package.nix
+++ b/pkgs/by-name/ti/tigervnc/package.nix
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "TigerVNC";
     repo = "tigervnc";
-    rev = "v${version}";
-    sha256 = "sha256-TgVV/4MRsQHYKpDf9L5eHMLVpdwvNy1KPDIe7xMlQ9o=";
+    tag = "v${version}";
+    hash = "sha256-TgVV/4MRsQHYKpDf9L5eHMLVpdwvNy1KPDIe7xMlQ9o=";
   };
 
   patches = [

From ef233976958eae6b5910177714110848d53bc426 Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Tue, 20 May 2025 12:22:07 +0200
Subject: [PATCH 3/4] tigervnc: use `finalAttrs` pattern instead of `rec`

---
 pkgs/by-name/ti/tigervnc/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ti/tigervnc/package.nix b/pkgs/by-name/ti/tigervnc/package.nix
index 57a81c4545d8..b9b75f099681 100644
--- a/pkgs/by-name/ti/tigervnc/package.nix
+++ b/pkgs/by-name/ti/tigervnc/package.nix
@@ -25,14 +25,14 @@
   ffmpeg,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "1.14.0";
   pname = "tigervnc";
 
   src = fetchFromGitHub {
     owner = "TigerVNC";
     repo = "tigervnc";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-TgVV/4MRsQHYKpDf9L5eHMLVpdwvNy1KPDIe7xMlQ9o=";
   };
 
@@ -125,10 +125,10 @@ stdenv.mkDerivation rec {
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       mkdir -p $out/Applications
-      mv 'TigerVNC Viewer ${version}.app' $out/Applications/
+      mv 'TigerVNC Viewer ${finalAttrs.version}.app' $out/Applications/
       rm $out/bin/vncviewer
       echo "#!/usr/bin/env bash
-      open $out/Applications/TigerVNC\ Viewer\ ${version}.app --args \$@" >> $out/bin/vncviewer
+      open $out/Applications/TigerVNC\ Viewer\ ${finalAttrs.version}.app --args \$@" >> $out/bin/vncviewer
       chmod +x $out/bin/vncviewer
     '';
 
@@ -198,4 +198,4 @@ stdenv.mkDerivation rec {
     # Prevent a store collision.
     priority = 4;
   };
-}
+})

From a9d30eba6722c8b9386467f833c030b75390850f Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Tue, 20 May 2025 12:22:34 +0200
Subject: [PATCH 4/4] tigervnc: 1.14.0 -> 1.15.0

https://github.com/TigerVNC/tigervnc/releases/tag/v1.15.0

...also drop a patch that is now included in the release:
 https://github.com/TigerVNC/tigervnc/commit/4f6a3521874da5a67fd746389cfa9b6199eb3582
---
 pkgs/by-name/ti/tigervnc/package.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ti/tigervnc/package.nix b/pkgs/by-name/ti/tigervnc/package.nix
index b9b75f099681..55dc8b138a77 100644
--- a/pkgs/by-name/ti/tigervnc/package.nix
+++ b/pkgs/by-name/ti/tigervnc/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   xorg,
   xkeyboard_config,
   zlib,
@@ -26,24 +25,16 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.14.0";
+  version = "1.15.0";
   pname = "tigervnc";
 
   src = fetchFromGitHub {
     owner = "TigerVNC";
     repo = "tigervnc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TgVV/4MRsQHYKpDf9L5eHMLVpdwvNy1KPDIe7xMlQ9o=";
+    hash = "sha256-ZuuvRJe/lAqULWObPxGHVJrDPCTK4IVSqX0K1rWOctw=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "vncauth-security-type.patch";
-      url = "https://github.com/TigerVNC/tigervnc/commit/4f6a3521874da5a67fd746389cfa9b6199eb3582.diff";
-      hash = "sha256-lSkR8e+jsBwkQUJZmA0tb8nM5iSbYtO8uVXtgk5wdF8=";
-    })
-  ];
-
   postPatch =
     lib.optionalString stdenv.hostPlatform.isLinux ''
       sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver/vncserver.in