From 807cc2779258a3d13be127f085bab97285603580 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Mon, 22 Jun 2026 20:02:09 -0400
Subject: [PATCH] xinit: make --with-xserver path configurable

---
 pkgs/by-name/xi/xinit/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/xi/xinit/package.nix b/pkgs/by-name/xi/xinit/package.nix
index af3c4a7ccdb3..4e191c5328d2 100644
--- a/pkgs/by-name/xi/xinit/package.nix
+++ b/pkgs/by-name/xi/xinit/package.nix
@@ -12,6 +12,9 @@
   xauth,
   xorg-server,
   nix-update-script,
+
+  # path to the X server binary to use - override for setuid, for example: "/run/wrappers/bin/X"
+  xserverPath ? "${xorg-server.out}/bin/X",
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "xinit";
@@ -53,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   configureFlags = [
-    "--with-xserver=${xorg-server.out}/bin/X"
+    "--with-xserver=${xserverPath}"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     "--with-launchd=yes"