From 8b3b75cbe321ec2fe35f00190346a1dab8f06848 Mon Sep 17 00:00:00 2001
From: blueagle <jan@blueagle.dev>
Date: Thu, 10 Sep 2026 08:29:10 +0200
Subject: [PATCH] packaging(nix): use the top-level X11 libraries, not the
 deprecated xorg set

nixpkgs 26.05 deprecated the xorg package set in favour of the top-level
names, which exist from 25.11 on. Each xorg package now emits an
evaluation warning when instantiated, and package-desktop.nix uses 12 of
them; with allowAliases = false the set is absent and the file fails to
evaluate. This takes the same 12 libraries as top-level arguments
instead. The resulting derivation is unchanged: same drvPath before and
after on the flake's pinned nixpkgs.

Requires nixpkgs >= 25.11; drops 25.05, which has no lowercase top-level
libx11. That affects the copy-the-file route in packaging/nix/README.md
and flake consumers that make zennotes follow a 25.05 nixpkgs; the
flake's own lock is unaffected. 25.05 has been end-of-life since
2025-12-31.
---
 packaging/nix/package-desktop.nix | 37 ++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/packaging/nix/package-desktop.nix b/packaging/nix/package-desktop.nix
index 73e3542c..2c68e5db 100644
--- a/packaging/nix/package-desktop.nix
+++ b/packaging/nix/package-desktop.nix
@@ -35,7 +35,18 @@
   pango,
   systemd,
   wayland,
-  xorg,
+  libx11,
+  libxcomposite,
+  libxcursor,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxi,
+  libxrandr,
+  libxrender,
+  libxscrnsaver,
+  libxtst,
+  libxcb,
 
   commandLineArgs ? "",
 }:
@@ -86,18 +97,18 @@ stdenv.mkDerivation (finalAttrs: {
     nss
     pango
     stdenv.cc.cc # libstdc++
-    xorg.libX11
-    xorg.libXcomposite
-    xorg.libXcursor
-    xorg.libXdamage
-    xorg.libXext
-    xorg.libXfixes
-    xorg.libXi
-    xorg.libXrandr
-    xorg.libXrender
-    xorg.libXScrnSaver
-    xorg.libXtst
-    xorg.libxcb
+    libx11
+    libxcomposite
+    libxcursor
+    libxdamage
+    libxext
+    libxfixes
+    libxi
+    libxrandr
+    libxrender
+    libxscrnsaver
+    libxtst
+    libxcb
   ];
 
   # dlopen'd at runtime (not in DT_NEEDED), so keep them on the wrapper's path.