From 4d2bff2efa7e033b8bd15a84e2368fabc21074ac Mon Sep 17 00:00:00 2001
From: William-Ro <william.r2409@gmail.com>
Date: Sat, 11 Apr 2026 02:00:42 -0600
Subject: [PATCH] fix: replace deprecated xorg.* package names with top-level
 equivalents
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Replace xorg.libX11 → libx11
- Replace xorg.libXcomposite → libxcomposite
- Replace xorg.libXdamage → libxdamage
- Replace xorg.libXext → libxext
- Replace xorg.libXfixes → libxfixes
- Replace xorg.libXrandr → libxrandr
- Replace xorg.libxcb → libxcb
- Remove duplicate xorg.libxkbfile (libxkbfile already listed)
- Rename icon output to co.anysphere.cursor.png to match desktop file

Resolves the evaluation warnings about deprecated xorg package set.
Supersedes the approach in #50, rebased on top of 3.0.16.
---
 package.nix | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/package.nix b/package.nix
index 7adbd82..c262a72 100644
--- a/package.nix
+++ b/package.nix
@@ -17,7 +17,13 @@
   at-spi2-atk,
   at-spi2-core,
   libxkbcommon,
-  xorg,
+  libx11,
+  libxcomposite,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxrandr,
+  libxcb,
   wayland,
   gtk3,
   glib,
@@ -71,7 +77,6 @@ if stdenv.hostPlatform.isLinux then
       # Keyboard/input handling (fixes native-keymap errors)
       libxkbfile
       libxkbcommon
-      xorg.libxkbfile
       # Security/credentials
       libsecret
       nss
@@ -97,13 +102,13 @@ if stdenv.hostPlatform.isLinux then
       libpulseaudio
       systemd
       # X11 libraries
-      xorg.libX11
-      xorg.libXcomposite
-      xorg.libXdamage
-      xorg.libXext
-      xorg.libXfixes
-      xorg.libXrandr
-      xorg.libxcb
+      libx11
+      libxcomposite
+      libxdamage
+      libxext
+      libxfixes
+      libxrandr
+      libxcb
     ];
 
     # Ensure Chrome is accessible with standard names
@@ -122,7 +127,7 @@ if stdenv.hostPlatform.isLinux then
       for size in 16 32 48 64 128 256 512 1024; do
         if [ -f ${appimageContents}/usr/share/icons/hicolor/''${size}x''${size}/apps/cursor.png ]; then
           install -Dm444 ${appimageContents}/usr/share/icons/hicolor/''${size}x''${size}/apps/cursor.png \
-            $out/share/icons/hicolor/''${size}x''${size}/apps/cursor.png
+            $out/share/icons/hicolor/''${size}x''${size}/apps/co.anysphere.cursor.png
         fi
       done
     '';