From ce221daf4546e54b6807e8f2c7518ccc8306dfc5 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Wed, 10 Sep 2025 19:34:08 +0800
Subject: [PATCH 1/4] thedesk: 24.2.1 -> 25.1.1

---
 pkgs/by-name/th/thedesk/package.nix | 50 +++++++++++++++--------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/th/thedesk/package.nix b/pkgs/by-name/th/thedesk/package.nix
index 7d91dd87ca17..70bad5b83682 100644
--- a/pkgs/by-name/th/thedesk/package.nix
+++ b/pkgs/by-name/th/thedesk/package.nix
@@ -5,65 +5,67 @@
   dpkg,
   autoPatchelfHook,
   makeWrapper,
-  electron,
   alsa-lib,
   gtk3,
   libxshmfence,
   libgbm,
+  libGL,
+  musl,
   nss,
+  systemd,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "thedesk";
-  version = "24.2.1";
+  version = "25.1.1";
 
   src = fetchurl {
-    url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb";
-    sha256 = "sha256-AdjygNnQ3qQB03cGcQ5EB0cY3XXWLrzfCqw/U8tq1Yo=";
+    url = "https://github.com/cutls/thedesk-next/releases/download/v${finalAttrs.version}/thedesk-next_${finalAttrs.version}_amd64.deb";
+    hash = "sha256-ATuK0YiHE0yQUPa4vSEWJRcJOPbvXH6YJ9YKzUojDzk=";
   };
 
   nativeBuildInputs = [
-    dpkg
     autoPatchelfHook
+    dpkg
     makeWrapper
   ];
 
   buildInputs = [
     alsa-lib
     gtk3
-    libxshmfence
     libgbm
+    libGL
+    libxshmfence
+    musl
     nss
   ];
 
-  dontBuild = true;
-  dontConfigure = true;
+  runtimeDependencies = [ systemd ];
 
   installPhase = ''
     runHook preInstall
 
-    mv usr $out
-    mv opt $out
-
-    # binary is not used and probably vulnerable to CVE(s)
-    rm $out/opt/TheDesk/thedesk
-
-    substituteInPlace $out/share/applications/thedesk.desktop \
-      --replace '/opt/TheDesk' $out/bin
-
-    makeWrapper ${electron}/bin/electron $out/bin/thedesk \
-      --add-flags $out/opt/TheDesk/resources/app.asar
+    substituteInPlace usr/share/applications/thedesk-next.desktop \
+      --replace-fail "/opt/TheDesk/thedesk-next" "thedesk"
+    cp --recursive usr $out
+    mkdir $out/libexec $out/bin
+    cp --recursive opt/TheDesk $out/libexec/thedesk
+    ln --symbolic $out/libexec/thedesk/thedesk-next $out/bin/thedesk
 
     runHook postInstall
   '';
 
-  meta = with lib; {
+  preFixup = ''
+    patchelf --add-needed libGL.so.1 $out/libexec/thedesk/thedesk-next
+  '';
+
+  meta = {
     description = "Mastodon/Misskey Client for PC";
     homepage = "https://thedesk.top";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.gpl3Only;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.gpl3Only;
     maintainers = [ ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "thedesk";
   };
-}
+})

From 19486dcdc3013ca670b55cc7b2ed25299b07a0e7 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Tue, 4 Nov 2025 05:00:42 +0000
Subject: [PATCH 2/4] thedesk: 25.1.1 -> 25.1.4

Diff: https://github.com/cutls/thedesk-next/compare/v25.1.1...v25.1.4
---
 pkgs/by-name/th/thedesk/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/th/thedesk/package.nix b/pkgs/by-name/th/thedesk/package.nix
index 70bad5b83682..ae2d0c437a79 100644
--- a/pkgs/by-name/th/thedesk/package.nix
+++ b/pkgs/by-name/th/thedesk/package.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "thedesk";
-  version = "25.1.1";
+  version = "25.1.4";
 
   src = fetchurl {
     url = "https://github.com/cutls/thedesk-next/releases/download/v${finalAttrs.version}/thedesk-next_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-ATuK0YiHE0yQUPa4vSEWJRcJOPbvXH6YJ9YKzUojDzk=";
+    hash = "sha256-z75mr8leL8fb/aNm1dhoISWrhpIItHX/J3Z7zfgVcao=";
   };
 
   nativeBuildInputs = [

From 9c25063efc7dac6dcb44f930892ce3a2b2edbd11 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sat, 22 Nov 2025 02:07:30 +0000
Subject: [PATCH 3/4] thedesk: 25.1.4 -> 25.2.1

Diff: https://github.com/cutls/thedesk-next/compare/v25.1.4...v25.2.1
---
 pkgs/by-name/th/thedesk/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/th/thedesk/package.nix b/pkgs/by-name/th/thedesk/package.nix
index ae2d0c437a79..d3cad3ecf933 100644
--- a/pkgs/by-name/th/thedesk/package.nix
+++ b/pkgs/by-name/th/thedesk/package.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "thedesk";
-  version = "25.1.4";
+  version = "25.2.1";
 
   src = fetchurl {
     url = "https://github.com/cutls/thedesk-next/releases/download/v${finalAttrs.version}/thedesk-next_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-z75mr8leL8fb/aNm1dhoISWrhpIItHX/J3Z7zfgVcao=";
+    hash = "sha256-bUhMDkDKKHI9HXXheCwxmODnfDfZ4AG38XNZOzr2NR8=";
   };
 
   nativeBuildInputs = [

From 9e82842761d4b9bb287407b1d8c26ffcbca979cc Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Thu, 4 Dec 2025 06:14:55 +0000
Subject: [PATCH 4/4] thedesk: 25.2.1 -> 25.2.2

Diff: https://github.com/cutls/thedesk-next/compare/v25.2.1...v25.2.2
---
 pkgs/by-name/th/thedesk/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/th/thedesk/package.nix b/pkgs/by-name/th/thedesk/package.nix
index d3cad3ecf933..8700ea4ed286 100644
--- a/pkgs/by-name/th/thedesk/package.nix
+++ b/pkgs/by-name/th/thedesk/package.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "thedesk";
-  version = "25.2.1";
+  version = "25.2.2";
 
   src = fetchurl {
     url = "https://github.com/cutls/thedesk-next/releases/download/v${finalAttrs.version}/thedesk-next_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-bUhMDkDKKHI9HXXheCwxmODnfDfZ4AG38XNZOzr2NR8=";
+    hash = "sha256-9Xd0YHkFHPVY6BHy0V1X7p27m2iJFVHmSickzMJeOXs=";
   };
 
   nativeBuildInputs = [