From f50f883a48d341183001295e21148064bd17e34f Mon Sep 17 00:00:00 2001
From: UnbreakableMJ <Mohamed.Hammad@SpacecraftSoftware.org>
Date: Thu, 2 Jul 2026 11:43:36 +0300
Subject: [PATCH] fix(claude-desktop): use flat xorg lib names (silence
 deprecation warnings)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The claude-desktop derivation used the deprecated xorg.* package set
(xorg.libX11, xorg.libXtst, ...), which printed 12 'xorg package set has been
deprecated' warnings on every eval/rebuild. Switch to the flat top-level names
(libx11, libxtst, libxscrnsaver, ...) — the same convention already used in
pkgs/chrome-remote-desktop/. No functional change; toplevel builds, claude-desktop
still in the closure, warnings gone.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 pkgs/claude-desktop/package.nix | 37 +++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/pkgs/claude-desktop/package.nix b/pkgs/claude-desktop/package.nix
index a7d8ff5..735d28e 100644
--- a/pkgs/claude-desktop/package.nix
+++ b/pkgs/claude-desktop/package.nix
@@ -49,7 +49,18 @@
   pango,
   systemd,
   wayland,
-  xorg,
+  libx11,
+  libxcb,
+  libxcomposite,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxkbfile,
+  libxrandr,
+  libxrender,
+  libxscrnsaver,
+  libxshmfence,
+  libxtst,
   # MCP launchers must resolve at runtime (npx / uvx)
   nodejs,
   uv,
@@ -102,18 +113,18 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.getLib stdenv.cc.cc) # libstdc++ / libgcc_s
     systemd # libudev
     wayland
-    xorg.libX11
-    xorg.libXcomposite
-    xorg.libXdamage
-    xorg.libXext
-    xorg.libXfixes
-    xorg.libXrandr
-    xorg.libXrender
-    xorg.libXtst
-    xorg.libXScrnSaver
-    xorg.libxcb
-    xorg.libxkbfile
-    xorg.libxshmfence
+    libx11
+    libxcb
+    libxcomposite
+    libxdamage
+    libxext
+    libxfixes
+    libxkbfile
+    libxrandr
+    libxrender
+    libxscrnsaver
+    libxshmfence
+    libxtst
   ];
 
   # Electron dlopen()s these at runtime (not in DT_NEEDED), so add them to rpath.