From b86c6266efa8906b688d3ec877e882dfc24fd2a7 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Wed, 18 Jun 2025 15:22:30 +0200
Subject: [PATCH 1/3] libvncserver: 0.9.14 -> 0.9.15

Also a minor cleanup
---
 pkgs/by-name/li/libvncserver/package.nix     | 14 ++++++--------
 pkgs/by-name/li/libvncserver/pkgconfig.patch | 12 ++++++------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/li/libvncserver/package.nix b/pkgs/by-name/li/libvncserver/package.nix
index b016e19af766..510717cfcc4d 100644
--- a/pkgs/by-name/li/libvncserver/package.nix
+++ b/pkgs/by-name/li/libvncserver/package.nix
@@ -12,9 +12,9 @@
   systemd,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libvncserver";
-  version = "0.9.14";
+  version = "0.9.15";
 
   outputs = [
     "out"
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "LibVNC";
     repo = "libvncserver";
-    rev = "LibVNCServer-${version}";
-    sha256 = "sha256-kqVZeCTp+Z6BtB6nzkwmtkJ4wtmjlSQBg05lD02cVvQ=";
+    tag = "LibVNCServer-${finalAttrs.version}";
+    hash = "sha256-a3acEjJM+ZA9jaB6qZ/czjIfx/L3j71VjJ6mtlqYcSw=";
   };
 
   patches = [
@@ -37,9 +37,7 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
-  cmakeFlags = [
-    "-DWITH_SYSTEMD=${if withSystemd then "ON" else "OFF"}"
-  ];
+  cmakeFlags = [ (lib.cmakeBool "WITH_SYSTEMD" withSystemd) ];
 
   buildInputs =
     [
@@ -63,4 +61,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/li/libvncserver/pkgconfig.patch b/pkgs/by-name/li/libvncserver/pkgconfig.patch
index 0b98e9e0a79b..929508b4d935 100644
--- a/pkgs/by-name/li/libvncserver/pkgconfig.patch
+++ b/pkgs/by-name/li/libvncserver/pkgconfig.patch
@@ -1,7 +1,7 @@
-diff --git a/libvncclient.pc.cmakein b/libvncclient.pc.cmakein
+diff --git a/src/libvncclient/libvncclient.pc.cmakein b/src/libvncclient/libvncclient.pc.cmakein
 index ceeda39d..2516e643 100644
---- a/libvncclient.pc.cmakein
-+++ b/libvncclient.pc.cmakein
+--- a/src/libvncclient/libvncclient.pc.cmakein
++++ b/src/libvncclient/libvncclient.pc.cmakein
 @@ -1,7 +1,7 @@
  prefix=@CMAKE_INSTALL_PREFIX@
  exec_prefix=@CMAKE_INSTALL_PREFIX@
@@ -12,10 +12,10 @@ index ceeda39d..2516e643 100644
  
  Name: LibVNCClient
  Description: A library for easy implementation of a VNC client.
-diff --git a/libvncserver.pc.cmakein b/libvncserver.pc.cmakein
+diff --git a/src/libvncserver/libvncserver.pc.cmakein b/src/libvncserver/libvncserver.pc.cmakein
 index 33ec6685..57244742 100644
---- a/libvncserver.pc.cmakein
-+++ b/libvncserver.pc.cmakein
+--- a/src/libvncserver/libvncserver.pc.cmakein
++++ b/src/libvncserver/libvncserver.pc.cmakein
 @@ -1,7 +1,7 @@
  prefix=@CMAKE_INSTALL_PREFIX@
  exec_prefix=@CMAKE_INSTALL_PREFIX@

From 815b4779387114ce22c55a09421afa8a5c78da52 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Wed, 18 Jun 2025 15:25:59 +0200
Subject: [PATCH 2/3] libvncserver: support static building

---
 pkgs/by-name/li/libvncserver/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libvncserver/package.nix b/pkgs/by-name/li/libvncserver/package.nix
index 510717cfcc4d..0d6b14a8fcf1 100644
--- a/pkgs/by-name/li/libvncserver/package.nix
+++ b/pkgs/by-name/li/libvncserver/package.nix
@@ -10,6 +10,8 @@
   libpng,
   withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
   systemd,
+
+  enableShared ? !stdenv.hostPlatform.isStatic,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -37,7 +39,10 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
   ];
 
-  cmakeFlags = [ (lib.cmakeBool "WITH_SYSTEMD" withSystemd) ];
+  cmakeFlags = [
+    (lib.cmakeBool "WITH_SYSTEMD" withSystemd)
+    (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
+  ];
 
   buildInputs =
     [

From e7f53ce4317d4e9f712f193985d0ee59feb96527 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Wed, 18 Jun 2025 15:38:57 +0200
Subject: [PATCH 3/3] libvncserver: opt-in to build examples

---
 pkgs/by-name/li/libvncserver/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/li/libvncserver/package.nix b/pkgs/by-name/li/libvncserver/package.nix
index 0d6b14a8fcf1..ecaceb3c56ad 100644
--- a/pkgs/by-name/li/libvncserver/package.nix
+++ b/pkgs/by-name/li/libvncserver/package.nix
@@ -12,6 +12,7 @@
   systemd,
 
   enableShared ? !stdenv.hostPlatform.isStatic,
+  buildExamples ? false,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeBool "WITH_SYSTEMD" withSystemd)
     (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
+    (lib.cmakeBool "WITH_EXAMPLES" buildExamples)
   ];
 
   buildInputs =