diff --git a/nix/default.nix b/nix/default.nix
index b458247e..eee38887 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -25,6 +25,12 @@
   libdrm,
   libexecinfo,
   libinput,
+  libxcb,
+  libxcb-errors,
+  libxcb-render-util,
+  libxcb-wm,
+  libxdmcp,
+  libxcursor,
   libxkbcommon,
   libuuid,
   libgbm,
@@ -38,7 +44,6 @@
   wayland,
   wayland-protocols,
   wayland-scanner,
-  xorg,
   xwayland,
   debug ? false,
   withTests ? false,
@@ -154,11 +159,12 @@ in
           hyprutils
           hyprwire
           libdrm
+          libgbm
           libGL
           libinput
           libuuid
+          libxcursor
           libxkbcommon
-          libgbm
           muparser
           pango
           pciutils
@@ -168,16 +174,15 @@ in
           wayland
           wayland-protocols
           wayland-scanner
-          xorg.libXcursor
         ]
         (optionals customStdenv.hostPlatform.isBSD [epoll-shim])
         (optionals customStdenv.hostPlatform.isMusl [libexecinfo])
         (optionals enableXWayland [
-          xorg.libxcb
-          xorg.libXdmcp
-          xorg.xcbutilerrors
-          xorg.xcbutilrenderutil
-          xorg.xcbutilwm
+          libxcb
+          libxcb-errors
+          libxcb-render-util
+          libxcb-wm
+          libxdmcp
           xwayland
         ])
         (optional withSystemd systemd)
diff --git a/nix/tests/default.nix b/nix/tests/default.nix
index df666e62..6052ee16 100644
--- a/nix/tests/default.nix
+++ b/nix/tests/default.nix
@@ -11,7 +11,7 @@ in {
         jq
         kitty
         wl-clipboard
-        xorg.xeyes
+        xeyes
       ];
 
       # Enabled by default for some reason