diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
index 4159c53657d7..c52ce1413e54 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   dontBuild = true;
   dontWrapGApps = true; # we only want $gappsWrapperArgs here
 
-  buildInputs = with xorg; [
+  buildInputs = [
     alsa-lib
     cairo
     freetype
@@ -52,16 +52,16 @@ stdenv.mkDerivation rec {
     libjack2
     # libjpeg8 is required for converting jpeg's to colour palettes
     libjpeg
-    libxcb
-    libXcursor
-    libX11
-    libXtst
+    xorg.libxcb
+    xorg.libXcursor
+    xorg.libX11
+    xorg.libXtst
     libxkbcommon
     pipewire
     pulseaudio
     (lib.getLib stdenv.cc.cc)
-    xcbutil
-    xcbutilwm
+    xorg.xcbutil
+    xorg.xcbutilwm
     zlib
   ];
 
diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix
index 6ec634d47d82..06a4ec986b98 100644
--- a/pkgs/applications/emulators/wine/base.nix
+++ b/pkgs/applications/emulators/wine/base.nix
@@ -163,17 +163,17 @@ stdenv.mkDerivation (
           pkgs.libdrm
         ]
         ++ lib.optionals x11Support (
-          with pkgs.xorg;
+          with pkgs;
           [
-            libX11
-            libXcomposite
-            libXcursor
-            libXext
-            libXfixes
-            libXi
-            libXrandr
-            libXrender
-            libXxf86vm
+            xorg.libX11
+            xorg.libXcomposite
+            xorg.libXcursor
+            xorg.libXext
+            xorg.libXfixes
+            xorg.libXi
+            xorg.libXrandr
+            xorg.libXrender
+            xorg.libXxf86vm
           ]
         )
         ++ lib.optionals waylandSupport (
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 013382e7f1f4..681cb813ea00 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -31,6 +31,7 @@
   sndio,
   libjack2,
   speechd-minimal,
+  zlib,
 }:
 
 ## configurability of the wrapper itself
@@ -109,19 +110,16 @@ let
         ++ lib.optional ffmpegSupport ffmpeg_7
         ++ lib.optional gssSupport libkrb5
         ++ lib.optional useGlvnd libglvnd
-        ++ lib.optionals (cfg.enableQuakeLive or false) (
-          with xorg;
-          [
-            stdenv.cc
-            libX11
-            libXxf86dga
-            libXxf86vm
-            libXext
-            libXt
-            alsa-lib
-            zlib
-          ]
-        )
+        ++ lib.optionals (cfg.enableQuakeLive or false) [
+          stdenv.cc
+          xorg.libX11
+          xorg.libXxf86dga
+          xorg.libXxf86vm
+          xorg.libXext
+          xorg.libXt
+          alsa-lib
+          zlib
+        ]
         ++ lib.optional (config.pulseaudio or (!isDarwin)) libpulseaudio
         ++ lib.optional alsaSupport alsa-lib
         ++ lib.optional sndioSupport sndio
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index e2e03f4b8b63..56988179d066 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -55,23 +55,20 @@ buildFHSEnv {
   unsharePid = false;
 
   targetPkgs =
-    pkgs:
-    with pkgs;
-    with xorg;
-    [
-      libICE
-      libSM
-      libX11
-      libXcomposite
-      libXdamage
-      libXext
-      libXfixes
-      libXrender
-      libXmu
-      libXxf86vm
+    pkgs: with pkgs; [
+      xorg.libICE
+      xorg.libSM
+      xorg.libX11
+      xorg.libXcomposite
+      xorg.libXdamage
+      xorg.libXext
+      xorg.libXfixes
+      xorg.libXrender
+      xorg.libXmu
+      xorg.libXxf86vm
       libGL
-      libxcb
-      xkeyboardconfig
+      xorg.libxcb
+      xorg.xkeyboardconfig
       curl
       dbus
       firefox-bin
@@ -86,8 +83,8 @@ buildFHSEnv {
       procps
       zlib
       libgbm
-      libxshmfence
-      libpthreadstubs
+      xorg.libxshmfence
+      xorg.libpthreadstubs
       libappindicator
     ];
 
diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix
index e8019c32595c..ea0eca43ebab 100644
--- a/pkgs/applications/networking/instant-messengers/franz/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix
@@ -71,19 +71,19 @@ stdenv.mkDerivation (
     ];
     buildInputs =
       extraBuildInputs
-      ++ (with xorg; [
-        libXi
-        libXcursor
-        libXdamage
-        libXrandr
-        libXcomposite
-        libXext
-        libXfixes
-        libXrender
-        libX11
-        libXtst
-        libXScrnSaver
-      ])
+      ++ [
+        xorg.libXi
+        xorg.libXcursor
+        xorg.libXdamage
+        xorg.libXrandr
+        xorg.libXcomposite
+        xorg.libXext
+        xorg.libXfixes
+        xorg.libXrender
+        xorg.libX11
+        xorg.libXtst
+        xorg.libXScrnSaver
+      ]
       ++ [
         libgbm
         gtk3
diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix
index 116336eb2a70..768c5e936de9 100644
--- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix
@@ -47,20 +47,16 @@ mkDerivation rec {
     libopus
     libGL
     alsa-lib
-  ]
-  ++ [
     qtbase
     qtsvg
     qtmultimedia
     qtwebsockets
     qtimageformats
-  ]
-  ++ (with xorg; [
-    libX11
-    libXScrnSaver
-    libXcursor
-    xkeyboardconfig
-  ]);
+    xorg.libX11
+    xorg.libXScrnSaver
+    xorg.libXcursor
+    xorg.xkeyboardconfig
+  ];
 
   fontsConf = makeFontsConf {
     fontDirectories = [ twemoji-color-font ];
diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/applications/science/math/wolfram-engine/default.nix
index a52435a26659..1272c1af05e1 100644
--- a/pkgs/applications/science/math/wolfram-engine/default.nix
+++ b/pkgs/applications/science/math/wolfram-engine/default.nix
@@ -63,21 +63,19 @@ stdenv.mkDerivation rec {
     zlib
     libGL
     libGLU
-  ]
-  ++ (with xorg; [
-    libX11
-    libXext
-    libXtst
-    libXi
-    libXmu
-    libXrender
-    libxcb
-    libXcursor
-    libXfixes
-    libXrandr
-    libICE
-    libSM
-  ]);
+    xorg.libX11
+    xorg.libXext
+    xorg.libXtst
+    xorg.libXi
+    xorg.libXmu
+    xorg.libXrender
+    xorg.libxcb
+    xorg.libXcursor
+    xorg.libXfixes
+    xorg.libXrandr
+    xorg.libICE
+    xorg.libSM
+  ];
 
   # some bundled libs are found through LD_LIBRARY_PATH
   autoPatchelfIgnoreMissingDeps = true;
diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix
index 88431b3f0c15..74c7f2fcf5f8 100644
--- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix
+++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
-  nativeBuildInputs = with xorg; [
+  nativeBuildInputs = [
     at-spi2-core
     atk
     alsa-lib
@@ -72,18 +72,18 @@ stdenv.mkDerivation rec {
     nss
     nspr
     libuuid
-    libX11
-    libxcb
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
-    libXrender
-    libXScrnSaver
-    libXtst
+    xorg.libX11
+    xorg.libxcb
+    xorg.libXcomposite
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libXScrnSaver
+    xorg.libXtst
     makeWrapper
     wrapGAppsHook3
   ];
diff --git a/pkgs/by-name/ai/airtame/package.nix b/pkgs/by-name/ai/airtame/package.nix
index 277092539143..a71b5a6f1b6f 100644
--- a/pkgs/by-name/ai/airtame/package.nix
+++ b/pkgs/by-name/ai/airtame/package.nix
@@ -31,12 +31,12 @@
   pciutils,
 }:
 let
-  xorgDeps = with xorg; [
-    libXdamage
-    libXext
-    libXfixes
-    libXcomposite
-    libXrandr
+  xorgDeps = [
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXcomposite
+    xorg.libXrandr
   ];
 
   deps = [
diff --git a/pkgs/by-name/al/alttpr-opentracker/package.nix b/pkgs/by-name/al/alttpr-opentracker/package.nix
index 07a6123025f0..398563c48fd7 100644
--- a/pkgs/by-name/al/alttpr-opentracker/package.nix
+++ b/pkgs/by-name/al/alttpr-opentracker/package.nix
@@ -52,13 +52,11 @@ buildDotnetModule rec {
     gtk3
     openssl
     xinput
-  ]
-  ++ (with xorg; [
-    libICE
-    libSM
-    libX11
-    libXi
-  ]);
+    xorg.libICE
+    xorg.libSM
+    xorg.libX11
+    xorg.libXi
+  ];
 
   autoPatchelfIgnoreMissingDeps = [
     "libc.musl-x86_64.so.1"
diff --git a/pkgs/by-name/an/anydesk/package.nix b/pkgs/by-name/an/anydesk/package.nix
index 4311d0366b21..f768306a6d94 100644
--- a/pkgs/by-name/an/anydesk/package.nix
+++ b/pkgs/by-name/an/anydesk/package.nix
@@ -63,23 +63,21 @@ stdenv.mkDerivation (finalAttrs: {
     polkit
     polkit_gnome
     pulseaudio
-  ]
-  ++ (with xorg; [
-    libxcb
-    libxkbfile
-    libX11
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXmu
-    libXrandr
-    libXtst
-    libXt
-    libICE
-    libSM
-    libXrender
-  ]);
+    xorg.libxcb
+    xorg.libxkbfile
+    xorg.libX11
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXmu
+    xorg.libXrandr
+    xorg.libXtst
+    xorg.libXt
+    xorg.libICE
+    xorg.libSM
+    xorg.libXrender
+  ];
 
   nativeBuildInputs = [
     copyDesktopItems
diff --git a/pkgs/by-name/av/avocode/package.nix b/pkgs/by-name/av/avocode/package.nix
index 5961fddf2b00..446e679ddf47 100644
--- a/pkgs/by-name/av/avocode/package.nix
+++ b/pkgs/by-name/av/avocode/package.nix
@@ -41,46 +41,43 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-vNQT4jyMIIAk1pV3Hrp40nawFutWCv7xtwg2gU6ejy0=";
   };
 
-  libPath = lib.makeLibraryPath (
-    with xorg;
-    [
-      stdenv.cc.cc
-      at-spi2-core.out
-      gdk-pixbuf
-      glib
-      gtk3
-      atk
-      at-spi2-atk
-      pango
-      cairo
-      freetype
-      fontconfig
-      dbus
-      nss
-      nspr
-      alsa-lib
-      cups
-      expat
-      udev
-      libX11
-      libxcb
-      libxshmfence
-      libxkbcommon
-      libXi
-      libXcursor
-      libXdamage
-      libXrandr
-      libXcomposite
-      libXext
-      libXfixes
-      libXrender
-      libXtst
-      libXScrnSaver
-      libuuid
-      libdrm
-      libgbm
-    ]
-  );
+  libPath = lib.makeLibraryPath [
+    stdenv.cc.cc
+    at-spi2-core.out
+    gdk-pixbuf
+    glib
+    gtk3
+    atk
+    at-spi2-atk
+    pango
+    cairo
+    freetype
+    fontconfig
+    dbus
+    nss
+    nspr
+    alsa-lib
+    cups
+    expat
+    udev
+    xorg.libX11
+    xorg.libxcb
+    xorg.libxshmfence
+    libxkbcommon
+    xorg.libXi
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXrandr
+    xorg.libXcomposite
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXrender
+    xorg.libXtst
+    xorg.libXScrnSaver
+    libuuid
+    libdrm
+    libgbm
+  ];
 
   desktopItem = makeDesktopItem {
     name = "Avocode";
diff --git a/pkgs/by-name/bi/binocle/package.nix b/pkgs/by-name/bi/binocle/package.nix
index e6b10eb15dd0..3b71bcbc900c 100644
--- a/pkgs/by-name/bi/binocle/package.nix
+++ b/pkgs/by-name/bi/binocle/package.nix
@@ -28,16 +28,13 @@ rustPlatform.buildRustPackage rec {
   postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
     wrapProgram $out/bin/binocle \
       --suffix LD_LIBRARY_PATH : ${
-        lib.makeLibraryPath (
-          with xorg;
-          [
-            libX11
-            libXcursor
-            libXi
-            libXrandr
-          ]
-          ++ [ vulkan-loader ]
-        )
+        lib.makeLibraryPath [
+          xorg.libX11
+          xorg.libXcursor
+          xorg.libXi
+          xorg.libXrandr
+          vulkan-loader
+        ]
       }
   '';
 
diff --git a/pkgs/by-name/bi/bitwig-studio3/package.nix b/pkgs/by-name/bi/bitwig-studio3/package.nix
index a65d3b08be92..c503ea929044 100644
--- a/pkgs/by-name/bi/bitwig-studio3/package.nix
+++ b/pkgs/by-name/bi/bitwig-studio3/package.nix
@@ -39,24 +39,24 @@ stdenv.mkDerivation (finalAttrs: {
   dontBuild = true;
   dontWrapGApps = true; # we only want $gappsWrapperArgs here
 
-  buildInputs = with xorg; [
+  buildInputs = [
     alsa-lib
     cairo
     freetype
     gdk-pixbuf
     glib
     gtk3
-    libxcb
-    xcbutil
-    xcbutilwm
+    xorg.libxcb
+    xorg.xcbutil
+    xorg.xcbutilwm
     zlib
-    libXtst
+    xorg.libXtst
     libxkbcommon
     pulseaudio
     libjack2
-    libX11
+    xorg.libX11
     libglvnd
-    libXcursor
+    xorg.libXcursor
     (lib.getLib stdenv.cc.cc)
   ];
 
diff --git a/pkgs/by-name/bo/bottles/package.nix b/pkgs/by-name/bo/bottles/package.nix
index 8b84cb39c1c6..3778eab0bcc1 100644
--- a/pkgs/by-name/bo/bottles/package.nix
+++ b/pkgs/by-name/bo/bottles/package.nix
@@ -27,23 +27,23 @@ let
     multiPkgs =
       let
         xorgDeps =
-          pkgs: with pkgs.xorg; [
-            libpthreadstubs
-            libSM
-            libX11
-            libXaw
-            libxcb
-            libXcomposite
-            libXcursor
-            libXdmcp
-            libXext
-            libXi
-            libXinerama
-            libXmu
-            libXrandr
-            libXrender
-            libXv
-            libXxf86vm
+          pkgs: with pkgs; [
+            xorg.libpthreadstubs
+            xorg.libSM
+            xorg.libX11
+            xorg.libXaw
+            xorg.libxcb
+            xorg.libXcomposite
+            xorg.libXcursor
+            xorg.libXdmcp
+            xorg.libXext
+            xorg.libXi
+            xorg.libXinerama
+            xorg.libXmu
+            xorg.libXrandr
+            xorg.libXrender
+            xorg.libXv
+            xorg.libXxf86vm
           ];
         gstreamerDeps =
           pkgs: with pkgs.gst_all_1; [
diff --git a/pkgs/by-name/ce/celestegame/package.nix b/pkgs/by-name/ce/celestegame/package.nix
index 0339ed298f2b..9f0f38087dea 100644
--- a/pkgs/by-name/ce/celestegame/package.nix
+++ b/pkgs/by-name/ce/celestegame/package.nix
@@ -82,9 +82,7 @@ buildFHSEnv {
   version = celeste.version + (lib.optionalString withEverest "+everest.${everest.version}");
 
   multiPkgs =
-    pkgs:
-    with pkgs;
-    [
+    pkgs: with pkgs; [
       glib
       glibc_multi
       kdePackages.wayland
@@ -134,23 +132,21 @@ buildFHSEnv {
       libpulseaudio
       pipewire
       vulkan-loader
-    ]
-    ++ (with xorg; [
-      libX11
-      libXcomposite
-      libXdamage
-      libXfixes
-      libXext
-      libxcb
-      libXcursor
-      libXinerama
-      libXi
-      libXrandr
-      libXScrnSaver
-      libXxf86vm
-      libXau
-      libXdmcp
-    ]);
+      xorg.libX11
+      xorg.libXcomposite
+      xorg.libXdamage
+      xorg.libXfixes
+      xorg.libXext
+      xorg.libxcb
+      xorg.libXcursor
+      xorg.libXinerama
+      xorg.libXi
+      xorg.libXrandr
+      xorg.libXScrnSaver
+      xorg.libXxf86vm
+      xorg.libXau
+      xorg.libXdmcp
+    ];
 
   targetPkgs = pkgs: [ celeste ];
 
diff --git a/pkgs/by-name/ce/centerpiece/package.nix b/pkgs/by-name/ce/centerpiece/package.nix
index e150dcd40317..eeb859bbe4e8 100644
--- a/pkgs/by-name/ce/centerpiece/package.nix
+++ b/pkgs/by-name/ce/centerpiece/package.nix
@@ -34,15 +34,12 @@ rustPlatform.buildRustPackage rec {
     vulkan-loader
     wayland
   ]
-  ++ lib.optionals enableX11 (
-    with xorg;
-    [
-      libX11
-      libXcursor
-      libXi
-      libXrandr
-    ]
-  );
+  ++ lib.optionals enableX11 [
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXi
+    xorg.libXrandr
+  ];
 
   postFixup = lib.optional stdenv.hostPlatform.isLinux ''
     rpath=$(patchelf --print-rpath $out/bin/centerpiece)
diff --git a/pkgs/by-name/ce/cernlib/package.nix b/pkgs/by-name/ce/cernlib/package.nix
index 44d551428671..8c3bf0cdd570 100644
--- a/pkgs/by-name/ce/cernlib/package.nix
+++ b/pkgs/by-name/ce/cernlib/package.nix
@@ -47,20 +47,18 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ cmake ];
-  buildInputs =
-    with xorg;
-    [
-      freetype
-      gfortran
-      openssl
-      libX11
-      libXaw
-      libXft
-      libXt
-      libxcrypt
-      motif
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux libnsl;
+  buildInputs = [
+    freetype
+    gfortran
+    openssl
+    xorg.libX11
+    xorg.libXaw
+    xorg.libXft
+    xorg.libXt
+    libxcrypt
+    motif
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux libnsl;
 
   setupHook = ./setup-hook.sh;
 
diff --git a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix
index 70cb47068bb6..77dfa24fc3cf 100644
--- a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix
+++ b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix
@@ -65,13 +65,11 @@ let
       libxslt
       nspr
       nss
-    ]
-    ++ (with xorg; [
-      libICE
-      libSM
-      libX11
-      libXScrnSaver
-    ]);
+      xorg.libICE
+      xorg.libSM
+      xorg.libX11
+      xorg.libXScrnSaver
+    ];
 
     unpackPhase = ''
       runHook preUnpack
diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
index 3d9dee8ca0a2..f5f65382a762 100644
--- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
+++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix
@@ -77,27 +77,25 @@ let
       nspr
       nss
       wayland
-    ]
-    ++ (with xorg; [
-      libICE
-      libSM
-      libX11
-      libXScrnSaver
-      libXcomposite
-      libXcursor
-      libXdamage
-      libXext
-      libXfixes
-      libXi
-      libXrandr
-      libXrender
-      libXtst
-      libxcb
-      xcbutilimage
-      xcbutilkeysyms
-      xcbutilrenderutil
-      xcbutilwm
-    ]);
+      xorg.libICE
+      xorg.libSM
+      xorg.libX11
+      xorg.libXScrnSaver
+      xorg.libXcomposite
+      xorg.libXcursor
+      xorg.libXdamage
+      xorg.libXext
+      xorg.libXfixes
+      xorg.libXi
+      xorg.libXrandr
+      xorg.libXrender
+      xorg.libXtst
+      xorg.libxcb
+      xorg.xcbutilimage
+      xorg.xcbutilkeysyms
+      xorg.xcbutilrenderutil
+      xorg.xcbutilwm
+    ];
 
     unpackPhase = ''
       runHook preUnpack
diff --git a/pkgs/by-name/db/dbus/package.nix b/pkgs/by-name/db/dbus/package.nix
index 5e38403c93cc..f101a9c4b4db 100644
--- a/pkgs/by-name/db/dbus/package.nix
+++ b/pkgs/by-name/db/dbus/package.nix
@@ -69,14 +69,11 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs =
-    lib.optionals x11Support (
-      with xorg;
-      [
-        libX11
-        libICE
-        libSM
-      ]
-    )
+    lib.optionals x11Support [
+      xorg.libX11
+      xorg.libICE
+      xorg.libSM
+    ]
     ++ lib.optional enableSystemd systemdMinimal
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       audit
diff --git a/pkgs/by-name/di/directfb/package.nix b/pkgs/by-name/di/directfb/package.nix
index 79b009cd05ea..013b0f0f62c3 100644
--- a/pkgs/by-name/di/directfb/package.nix
+++ b/pkgs/by-name/di/directfb/package.nix
@@ -86,15 +86,12 @@ stdenv.mkDerivation rec {
     libpng
   ]
   ++ lib.optional enableSDL SDL
-  ++ lib.optionals enableX11 (
-    with xorg;
-    [
-      xorgproto
-      libX11
-      libXext
-      libXrender
-    ]
-  );
+  ++ lib.optionals enableX11 [
+    xorg.xorgproto
+    xorg.libX11
+    xorg.libXext
+    xorg.libXrender
+  ];
 
   env = {
     NIX_LDFLAGS = "-lgcc_s";
diff --git a/pkgs/by-name/di/displaycal/package.nix b/pkgs/by-name/di/displaycal/package.nix
index 5b114b0bff14..f22378ff93d9 100644
--- a/pkgs/by-name/di/displaycal/package.nix
+++ b/pkgs/by-name/di/displaycal/package.nix
@@ -41,14 +41,12 @@ python3.pkgs.buildPythonApplication rec {
   buildInputs = [
     gtk3
     librsvg
-  ]
-  ++ (with xorg; [
-    libX11
-    libXxf86vm
-    libXext
-    libXinerama
-    libXrandr
-  ]);
+    xorg.libX11
+    xorg.libXxf86vm
+    xorg.libXext
+    xorg.libXinerama
+    xorg.libXrandr
+  ];
 
   # Workaround for eoyilmaz/displaycal-py3#261
   setupPyGlobalFlags = [ "appdata" ];
diff --git a/pkgs/by-name/ef/efont-unicode/package.nix b/pkgs/by-name/ef/efont-unicode/package.nix
index b01dfb81f8c6..2c8d7c2c42b3 100644
--- a/pkgs/by-name/ef/efont-unicode/package.nix
+++ b/pkgs/by-name/ef/efont-unicode/package.nix
@@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-fT7SsYlV3dCQrf0IZfiNI1grj3ngDgr8IkWdg+f9m3M=";
   };
 
-  nativeBuildInputs = with xorg; [
+  nativeBuildInputs = [
     libfaketime
-    bdftopcf
-    fonttosfnt
-    mkfontscale
+    xorg.bdftopcf
+    xorg.fonttosfnt
+    xorg.mkfontscale
   ];
 
   buildPhase = ''
diff --git a/pkgs/by-name/el/eli/package.nix b/pkgs/by-name/el/eli/package.nix
index 28973f67f1d3..f532faa20b31 100644
--- a/pkgs/by-name/el/eli/package.nix
+++ b/pkgs/by-name/el/eli/package.nix
@@ -47,13 +47,11 @@ stdenv.mkDerivation rec {
   buildInputs = [
     ncurses
     fontconfig
-  ]
-  ++ (with xorg; [
-    libX11.dev
-    libXt.dev
-    libXaw.dev
-    libXext.dev
-  ]);
+    xorg.libX11.dev
+    xorg.libXt.dev
+    xorg.libXaw.dev
+    xorg.libXext.dev
+  ];
 
   nativeBuildInputs = [
     file
diff --git a/pkgs/by-name/en/enpass/package.nix b/pkgs/by-name/en/enpass/package.nix
index fec608d27e23..ef25ad4b3802 100644
--- a/pkgs/by-name/en/enpass/package.nix
+++ b/pkgs/by-name/en/enpass/package.nix
@@ -42,38 +42,35 @@ let
   baseUrl = "https://apt.enpass.io";
 
   # used of both wrappers and libpath
-  libPath = lib.makeLibraryPath (
-    with xorg;
-    [
-      libGLU
-      libGL
-      fontconfig
-      freetype
-      libpulseaudio
-      zlib
-      dbus
-      libX11
-      libXi
-      libSM
-      libICE
-      libXrender
-      libXScrnSaver
-      libxcb
-      libcap
-      glib
-      gtk3
-      pango
-      curl
-      libuuid
-      cups
-      xcbutilwm # libxcb-icccm.so.4
-      xcbutilimage # libxcb-image.so.0
-      xcbutilkeysyms # libxcb-keysyms.so.1
-      xcbutilrenderutil # libxcb-render-util.so.0
-      xz
-      libxkbcommon
-    ]
-  );
+  libPath = lib.makeLibraryPath [
+    libGLU
+    libGL
+    fontconfig
+    freetype
+    libpulseaudio
+    zlib
+    dbus
+    xorg.libX11
+    xorg.libXi
+    xorg.libSM
+    xorg.libICE
+    xorg.libXrender
+    xorg.libXScrnSaver
+    xorg.libxcb
+    libcap
+    glib
+    gtk3
+    pango
+    curl
+    libuuid
+    cups
+    xorg.xcbutilwm # libxcb-icccm.so.4
+    xorg.xcbutilimage # libxcb-image.so.0
+    xorg.xcbutilkeysyms # libxcb-keysyms.so.1
+    xorg.xcbutilrenderutil # libxcb-render-util.so.0
+    xz
+    libxkbcommon
+  ];
   package = stdenv.mkDerivation {
 
     inherit (data) version;
diff --git a/pkgs/by-name/en/entangle/package.nix b/pkgs/by-name/en/entangle/package.nix
index 418ced9fd5ce..889bbedce93c 100644
--- a/pkgs/by-name/en/entangle/package.nix
+++ b/pkgs/by-name/en/entangle/package.nix
@@ -107,11 +107,9 @@ stdenv.mkDerivation (finalAttrs: {
     udev
     util-linux
     zstd
-  ]
-  ++ (with xorg; [
-    libXdmcp
-    libXtst
-  ]);
+    xorg.libXdmcp
+    xorg.libXtst
+  ];
 
   # Disable building of doc/reference since it requires network connection to render XML to HTML
   # Patch build script shebangs
diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix
index 682b71e2b338..dcba465b498f 100644
--- a/pkgs/by-name/ga/gamescope/package.nix
+++ b/pkgs/by-name/ga/gamescope/package.nix
@@ -174,10 +174,9 @@ stdenv.mkDerivation (finalAttrs: {
     # --debug-layers flag expects these in the path
     wrapProgram "$out/bin/gamescope" \
       --prefix PATH : ${
-        with xorg;
         lib.makeBinPath [
-          xprop
-          xwininfo
+          xorg.xprop
+          xorg.xwininfo
         ]
       }
 
diff --git a/pkgs/by-name/gt/gtk3/package.nix b/pkgs/by-name/gt/gtk3/package.nix
index df643c263bbc..f3afefdbdc23 100644
--- a/pkgs/by-name/gt/gtk3/package.nix
+++ b/pkgs/by-name/gt/gtk3/package.nix
@@ -161,20 +161,17 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gsettings-desktop-schemas
   ]
-  ++ lib.optionals x11Support (
-    with xorg;
-    [
-      libICE
-      libSM
-      libXcomposite
-      libXcursor
-      libXdamage
-      libXfixes
-      libXi
-      libXrandr
-      libXrender
-    ]
-  )
+  ++ lib.optionals x11Support [
+    xorg.libICE
+    xorg.libSM
+    xorg.libXcomposite
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXrender
+  ]
   ++ [
     # TODO: Reorder me on `staging`.
     pango
diff --git a/pkgs/by-name/gt/gtk4/package.nix b/pkgs/by-name/gt/gtk4/package.nix
index edd5393618ec..7d74b997b659 100644
--- a/pkgs/by-name/gt/gtk4/package.nix
+++ b/pkgs/by-name/gt/gtk4/package.nix
@@ -141,16 +141,14 @@ stdenv.mkDerivation (finalAttrs: {
     gst_all_1.gst-plugins-bad
     fribidi
     harfbuzz
+    xorg.libICE
+    xorg.libSM
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXrender
   ]
-  ++ (with xorg; [
-    libICE
-    libSM
-    libXcursor
-    libXdamage
-    libXi
-    libXrandr
-    libXrender
-  ])
   ++ lib.optionals trackerSupport [
     tinysparql
   ]
diff --git a/pkgs/by-name/ho/houdini/package.nix b/pkgs/by-name/ho/houdini/package.nix
index 0efde5272233..0b9b1e4b9fb2 100644
--- a/pkgs/by-name/ho/houdini/package.nix
+++ b/pkgs/by-name/ho/houdini/package.nix
@@ -19,9 +19,7 @@ buildFHSEnv {
   unsharePid = false;
 
   targetPkgs =
-    pkgs:
-    with pkgs;
-    [
+    pkgs: with pkgs; [
       libGLU
       libGL
       alsa-lib
@@ -44,35 +42,33 @@ buildFHSEnv {
       ocl-icd # needed for opencl
       numactl # needed by hfs ocl backend
       zstd # needed from 20.0
-    ]
-    ++ (with xorg; [
-      libICE
-      libSM
-      libXmu
-      libXi
-      libXt
-      libXext
-      libX11
-      libXrender
-      libXcursor
-      libXfixes
-      libXrender
-      libXcomposite
-      libXdamage
-      libXtst
-      libxcb
-      libXScrnSaver
-      libXrandr
-      libxcb
-      libxkbfile
-      libxshmfence
-      xcbutil
-      xcbutilimage
-      xcbutilrenderutil
-      xcbutilcursor
-      xcbutilkeysyms
-      xcbutilwm
-    ]);
+      xorg.libICE
+      xorg.libSM
+      xorg.libXmu
+      xorg.libXi
+      xorg.libXt
+      xorg.libXext
+      xorg.libX11
+      xorg.libXrender
+      xorg.libXcursor
+      xorg.libXfixes
+      xorg.libXrender
+      xorg.libXcomposite
+      xorg.libXdamage
+      xorg.libXtst
+      xorg.libxcb
+      xorg.libXScrnSaver
+      xorg.libXrandr
+      xorg.libxcb
+      xorg.libxkbfile
+      xorg.libxshmfence
+      xorg.xcbutil
+      xorg.xcbutilimage
+      xorg.xcbutilrenderutil
+      xorg.xcbutilcursor
+      xorg.xcbutilkeysyms
+      xorg.xcbutilwm
+    ];
 
   passthru = {
     inherit unwrapped;
diff --git a/pkgs/by-name/ho/hover/package.nix b/pkgs/by-name/ho/hover/package.nix
index ad4f9f92efcb..49e326d6edc4 100644
--- a/pkgs/by-name/ho/hover/package.nix
+++ b/pkgs/by-name/ho/hover/package.nix
@@ -20,18 +20,18 @@ let
   pname = "hover";
   version = "0.47.2";
 
-  libs = with xorg; [
-    libX11.dev
-    libXcursor.dev
-    libXext.dev
-    libXi.dev
-    libXinerama.dev
-    libXrandr.dev
-    libXrender.dev
-    libXfixes.dev
-    libXxf86vm
+  libs = [
+    xorg.libX11.dev
+    xorg.libXcursor.dev
+    xorg.libXext.dev
+    xorg.libXi.dev
+    xorg.libXinerama.dev
+    xorg.libXrandr.dev
+    xorg.libXrender.dev
+    xorg.libXfixes.dev
+    xorg.libXxf86vm
     libglvnd.dev
-    xorgproto
+    xorg.xorgproto
   ];
   hover = buildGoModule {
     inherit pname version;
diff --git a/pkgs/by-name/in/inxi/package.nix b/pkgs/by-name/in/inxi/package.nix
index 111b67019f64..fb1a57a369be 100644
--- a/pkgs/by-name/in/inxi/package.nix
+++ b/pkgs/by-name/in/inxi/package.nix
@@ -46,14 +46,12 @@ let
     upower
     pciutils
   ];
-  recommendedDisplayInformationPrograms = lib.optionals withRecommendedDisplayInformationPrograms (
-    [ mesa-demos ]
-    ++ (with xorg; [
-      xdpyinfo
-      xprop
-      xrandr
-    ])
-  );
+  recommendedDisplayInformationPrograms = lib.optionals withRecommendedDisplayInformationPrograms [
+    mesa-demos
+    xorg.xdpyinfo
+    xorg.xprop
+    xorg.xrandr
+  ];
   programs = [
     ps
     dnsutils
diff --git a/pkgs/by-name/ip/ipmiview/package.nix b/pkgs/by-name/ip/ipmiview/package.nix
index ec6543c27094..c202e0fac5bf 100644
--- a/pkgs/by-name/ip/ipmiview/package.nix
+++ b/pkgs/by-name/ip/ipmiview/package.nix
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
     makeWrapper
   ];
   buildPhase =
-    with xorg;
     let
       stunnelBinary =
         if stdenv.hostPlatform.system == "x86_64-linux" then
@@ -44,11 +43,11 @@ stdenv.mkDerivation rec {
 
       patchelf --set-rpath "${
         lib.makeLibraryPath [
-          libX11
-          libXext
-          libXrender
-          libXtst
-          libXi
+          xorg.libX11
+          xorg.libXext
+          xorg.libXrender
+          xorg.libXtst
+          xorg.libXi
         ]
       }" ./jre/lib/libawt_xawt.so
       patchelf --set-rpath "${lib.makeLibraryPath [ freetype ]}" ./jre/lib/libfontmanager.so
diff --git a/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix b/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix
index 5974ec91a873..4e95dfb48470 100644
--- a/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix
+++ b/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix
@@ -28,18 +28,16 @@ buildGoModule rec {
   buildInputs = [
     libGL
     nssmdns
-  ]
-  ++ (with xorg; [
-    libX11
-    libX11.dev
-    libXcursor
-    libXext
-    libXi
-    libXinerama
-    libXrandr
-    libXxf86vm
-    xinput
-  ]);
+    xorg.libX11
+    xorg.libX11.dev
+    xorg.libXcursor
+    xorg.libXext
+    xorg.libXi
+    xorg.libXinerama
+    xorg.libXrandr
+    xorg.libXxf86vm
+    xorg.xinput
+  ];
 
   meta = {
     description = "Desktop application to control Elgato Keylights";
diff --git a/pkgs/by-name/le/legends-of-equestria/package.nix b/pkgs/by-name/le/legends-of-equestria/package.nix
index e58c489d0684..3d2d4471e6af 100644
--- a/pkgs/by-name/le/legends-of-equestria/package.nix
+++ b/pkgs/by-name/le/legends-of-equestria/package.nix
@@ -66,21 +66,19 @@ let
     libGL
     vulkan-loader
     libasyncns
-  ]
-  ++ (with xorg; [
-    libX11
-    libxcb
-    libXau
-    libXdmcp
-    libXext
-    libXcursor
-    libXrender
-    libXfixes
-    libXinerama
-    libXi
-    libXrandr
-    libXScrnSaver
-  ]);
+    xorg.libX11
+    xorg.libxcb
+    xorg.libXau
+    xorg.libXdmcp
+    xorg.libXext
+    xorg.libXcursor
+    xorg.libXrender
+    xorg.libXfixes
+    xorg.libXinerama
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXScrnSaver
+  ];
 in
 stdenv.mkDerivation {
   inherit pname version;
diff --git a/pkgs/by-name/li/libuiohook/package.nix b/pkgs/by-name/li/libuiohook/package.nix
index 2ae4b266cbdb..f1924f0378ce 100644
--- a/pkgs/by-name/li/libuiohook/package.nix
+++ b/pkgs/by-name/li/libuiohook/package.nix
@@ -28,24 +28,20 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) (
-    [
-      libX11
-      libxcb
-      libxkbcommon
-      xinput
-    ]
-    ++ (with xorg; [
-      libXau
-      libXdmcp
-      libXi
-      libXinerama
-      libXt
-      libXtst
-      libXext
-      libxkbfile
-    ])
-  );
+  buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    libX11
+    libxcb
+    libxkbcommon
+    xinput
+    xorg.libXau
+    xorg.libXdmcp
+    xorg.libXi
+    xorg.libXinerama
+    xorg.libXt
+    xorg.libXtst
+    xorg.libXext
+    xorg.libxkbfile
+  ];
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/li/libvdpau/package.nix b/pkgs/by-name/li/libvdpau/package.nix
index 7fe2666c81d6..6a4f9e594899 100644
--- a/pkgs/by-name/li/libvdpau/package.nix
+++ b/pkgs/by-name/li/libvdpau/package.nix
@@ -29,9 +29,9 @@ stdenv.mkDerivation rec {
     ninja
     pkg-config
   ];
-  buildInputs = with xorg; [
-    xorgproto
-    libXext
+  buildInputs = [
+    xorg.xorgproto
+    xorg.libXext
   ];
 
   propagatedBuildInputs = [ xorg.libX11 ];
diff --git a/pkgs/by-name/li/libxklavier/package.nix b/pkgs/by-name/li/libxklavier/package.nix
index 3b722344ba69..cecbb5d42260 100644
--- a/pkgs/by-name/li/libxklavier/package.nix
+++ b/pkgs/by-name/li/libxklavier/package.nix
@@ -43,14 +43,14 @@ stdenv.mkDerivation rec {
   ++ lib.optionals withDoc [ "devdoc" ];
 
   # TODO: enable xmodmap support, needs xmodmap DB
-  propagatedBuildInputs = with xorg; [
-    libX11
-    libXi
+  propagatedBuildInputs = [
+    xorg.libX11
+    xorg.libXi
     xkeyboard_config
     libxml2
-    libICE
+    xorg.libICE
     glib
-    libxkbfile
+    xorg.libxkbfile
     isocodes
   ];
 
diff --git a/pkgs/by-name/lu/lutris/package.nix b/pkgs/by-name/lu/lutris/package.nix
index 28035da8dce6..21444c992e7b 100644
--- a/pkgs/by-name/lu/lutris/package.nix
+++ b/pkgs/by-name/lu/lutris/package.nix
@@ -25,28 +25,28 @@ let
       adwaita-icon-theme
     ];
   xorgDeps =
-    pkgs: with pkgs.xorg; [
-      libX11
-      libXrender
-      libXrandr
-      libxcb
-      libXmu
-      libpthreadstubs
-      libXext
-      libXdmcp
-      libXxf86vm
-      libXinerama
-      libSM
-      libXv
-      libXaw
-      libXi
-      libXcursor
-      libXcomposite
-      libXfixes
-      libXtst
-      libXScrnSaver
-      libICE
-      libXt
+    pkgs: with pkgs; [
+      xorg.libX11
+      xorg.libXrender
+      xorg.libXrandr
+      xorg.libxcb
+      xorg.libXmu
+      xorg.libpthreadstubs
+      xorg.libXext
+      xorg.libXdmcp
+      xorg.libXxf86vm
+      xorg.libXinerama
+      xorg.libSM
+      xorg.libXv
+      xorg.libXaw
+      xorg.libXi
+      xorg.libXcursor
+      xorg.libXcomposite
+      xorg.libXfixes
+      xorg.libXtst
+      xorg.libXScrnSaver
+      xorg.libICE
+      xorg.libXt
     ];
   gstreamerDeps =
     pkgs: with pkgs.gst_all_1; [
diff --git a/pkgs/by-name/ma/mathematica/generic.nix b/pkgs/by-name/ma/mathematica/generic.nix
index 9f335c07e569..d642028cae39 100644
--- a/pkgs/by-name/ma/mathematica/generic.nix
+++ b/pkgs/by-name/ma/mathematica/generic.nix
@@ -115,25 +115,23 @@ stdenv.mkDerivation {
     xcbutilimage
     xcbutilkeysyms
     xkeyboard_config
+    xorg.libICE
+    xorg.libSM
+    xorg.libX11
+    xorg.libXScrnSaver
+    xorg.libXcomposite
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXinerama
+    xorg.libXmu
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libXtst
+    xorg.libxcb
   ]
-  ++ (with xorg; [
-    libICE
-    libSM
-    libX11
-    libXScrnSaver
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXinerama
-    libXmu
-    libXrandr
-    libXrender
-    libXtst
-    libxcb
-  ])
   ++ lib.optional cudaSupport cudaEnv;
 
   wrapProgramFlags = [
diff --git a/pkgs/by-name/me/menyoki/package.nix b/pkgs/by-name/me/menyoki/package.nix
index e590c11abcc6..9198f0f4d442 100644
--- a/pkgs/by-name/me/menyoki/package.nix
+++ b/pkgs/by-name/me/menyoki/package.nix
@@ -28,13 +28,10 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs =
     lib.optional withSixel libsixel
-    ++ lib.optionals stdenv.hostPlatform.isLinux (
-      with xorg;
-      [
-        libX11
-        libXrandr
-      ]
-    );
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      xorg.libX11
+      xorg.libXrandr
+    ];
 
   buildNoDefaultFeatures = !withSki;
   buildFeatures = lib.optional withSixel "sixel";
diff --git a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
index 10d30d052747..d1adf3dfd117 100644
--- a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
+++ b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
@@ -91,15 +91,13 @@ let
       libgbm
       libGL
       libglvnd
-    ]
-    ++ (with xorg; [
-      libX11
-      libXcomposite
-      libXdamage
-      libXrandr
-      libXfixes
-      libXcursor
-    ]);
+      xorg.libX11
+      xorg.libXcomposite
+      xorg.libXdamage
+      xorg.libXrandr
+      xorg.libXfixes
+      xorg.libXcursor
+    ];
 
     # Required to launch the application and proceed past the zygote_linux fork() process
     # Fixes `Zygote could not fork`
diff --git a/pkgs/by-name/op/openvscode-server/package.nix b/pkgs/by-name/op/openvscode-server/package.nix
index 9920ed2b1447..db9983467558 100644
--- a/pkgs/by-name/op/openvscode-server/package.nix
+++ b/pkgs/by-name/op/openvscode-server/package.nix
@@ -109,11 +109,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs =
     lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ]
-    ++ (with xorg; [
-      libX11
-      libxkbfile
+    ++ [
+      xorg.libX11
+      xorg.libxkbfile
       libkrb5
-    ])
+    ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       cctools
     ];
diff --git a/pkgs/by-name/pi/pixinsight/package.nix b/pkgs/by-name/pi/pixinsight/package.nix
index 4a3b74a2eaae..6664adc2038d 100644
--- a/pkgs/by-name/pi/pixinsight/package.nix
+++ b/pkgs/by-name/pi/pixinsight/package.nix
@@ -150,18 +150,16 @@ let
         brotli
         libxkbcommon
         libxcb
-      ]
-      ++ (with pkgs.xorg; [
-        libX11
-        libXdamage
-        xrandr
-        libXtst
-        libXcomposite
-        libXext
-        libXfixes
-        libXrandr
-        libxkbfile
-      ]);
+        xorg.libX11
+        xorg.libXdamage
+        xorg.xrandr
+        xorg.libXtst
+        xorg.libXcomposite
+        xorg.libXext
+        xorg.libXfixes
+        xorg.libXrandr
+        xorg.libxkbfile
+      ];
 
     profile = ''
       export QT_QPA_PLATFORM_PLUGIN_PATH=/opt/PixInsight/bin/lib/qt-plugins/platforms
diff --git a/pkgs/by-name/rl/rlaunch/package.nix b/pkgs/by-name/rl/rlaunch/package.nix
index ec3db0778c74..58d4fdf605f3 100644
--- a/pkgs/by-name/rl/rlaunch/package.nix
+++ b/pkgs/by-name/rl/rlaunch/package.nix
@@ -21,14 +21,11 @@ rustPlatform.buildRustPackage rec {
   # The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath.
   postFixup = ''
     patchelf --set-rpath ${
-      lib.makeLibraryPath (
-        with xorg;
-        [
-          libX11
-          libXft
-          libXinerama
-        ]
-      )
+      lib.makeLibraryPath [
+        xorg.libX11
+        xorg.libXft
+        xorg.libXinerama
+      ]
     } $out/bin/rlaunch
   '';
 
diff --git a/pkgs/by-name/rx/rx/package.nix b/pkgs/by-name/rx/rx/package.nix
index 73a0a9de8053..a38261d246f8 100644
--- a/pkgs/by-name/rx/rx/package.nix
+++ b/pkgs/by-name/rx/rx/package.nix
@@ -29,18 +29,15 @@ rustPlatform.buildRustPackage rec {
     makeWrapper
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux (
-    with xorg;
-    [
-      # glfw-sys dependencies:
-      libX11
-      libXrandr
-      libXinerama
-      libXcursor
-      libXi
-      libXext
-    ]
-  );
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    # glfw-sys dependencies:
+    xorg.libX11
+    xorg.libXrandr
+    xorg.libXinerama
+    xorg.libXcursor
+    xorg.libXi
+    xorg.libXext
+  ];
 
   # FIXME: GLFW (X11) requires DISPLAY env variable for all tests
   doCheck = false;
diff --git a/pkgs/by-name/ry/rymdport/package.nix b/pkgs/by-name/ry/rymdport/package.nix
index 931b52226870..e4889a94d303 100644
--- a/pkgs/by-name/ry/rymdport/package.nix
+++ b/pkgs/by-name/ry/rymdport/package.nix
@@ -24,15 +24,15 @@ buildGoModule rec {
     pkg-config
   ];
 
-  buildInputs = with xorg; [
+  buildInputs = [
     libGL
-    libX11
-    libXcursor
-    libXext
-    libXi
-    libXinerama
-    libXrandr
-    libXxf86vm
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXext
+    xorg.libXi
+    xorg.libXinerama
+    xorg.libXrandr
+    xorg.libXxf86vm
   ];
 
   postInstall = ''
diff --git a/pkgs/by-name/sc/scilab-bin/package.nix b/pkgs/by-name/sc/scilab-bin/package.nix
index 3c6fd4251f41..061719afbd94 100644
--- a/pkgs/by-name/sc/scilab-bin/package.nix
+++ b/pkgs/by-name/sc/scilab-bin/package.nix
@@ -88,18 +88,16 @@ let
       alsa-lib
       ncurses5
       stdenv.cc.cc
-    ]
-    ++ (with xorg; [
-      libX11
-      libXcursor
-      libXext
-      libXft
-      libXi
-      libXrandr
-      libXrender
-      libXtst
-      libXxf86vm
-    ]);
+      xorg.libX11
+      xorg.libXcursor
+      xorg.libXext
+      xorg.libXft
+      xorg.libXi
+      xorg.libXrandr
+      xorg.libXrender
+      xorg.libXtst
+      xorg.libXxf86vm
+    ];
 
     installPhase = ''
       runHook preInstall
diff --git a/pkgs/by-name/sn/snake4/package.nix b/pkgs/by-name/sn/snake4/package.nix
index 6b5d948edb2a..ae198bb32c1e 100644
--- a/pkgs/by-name/sn/snake4/package.nix
+++ b/pkgs/by-name/sn/snake4/package.nix
@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
     sha256 = "14cng9l857np42zixp440mbc8y5675frb6lhsds53j1cws9cncw9";
   };
 
-  buildInputs = with xorg; [
+  buildInputs = [
     shhmsg
     shhopt
-    libX11
-    libXt
-    libXpm
-    libXaw
-    libXext
+    xorg.libX11
+    xorg.libXt
+    xorg.libXpm
+    xorg.libXaw
+    xorg.libXext
   ];
 
   preInstall = ''
diff --git a/pkgs/by-name/sn/snd/package.nix b/pkgs/by-name/sn/snd/package.nix
index 781af960372a..7ca43cc47689 100644
--- a/pkgs/by-name/sn/snd/package.nix
+++ b/pkgs/by-name/sn/snd/package.nix
@@ -31,12 +31,12 @@ stdenv.mkDerivation rec {
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
   ]
-  ++ (with xorg; [
-    libXext
-    libXft
-    libXpm
-    libXt
-  ]);
+  ++ [
+    xorg.libXext
+    xorg.libXft
+    xorg.libXpm
+    xorg.libXt
+  ];
 
   configureFlags = [
     "--with-motif"
diff --git a/pkgs/by-name/su/sumo/package.nix b/pkgs/by-name/su/sumo/package.nix
index 64540c343c97..d52d7ce8e880 100644
--- a/pkgs/by-name/su/sumo/package.nix
+++ b/pkgs/by-name/su/sumo/package.nix
@@ -70,16 +70,14 @@ stdenv.mkDerivation rec {
     xercesc
     zlib
     python3
-  ]
-  ++ (with xorg; [
     libX11
-    libXcursor
-    libXext
-    libXfixes
-    libXft
-    libXrandr
-    libXrender
-  ]);
+    xorg.libXcursor
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXft
+    xorg.libXrandr
+    xorg.libXrender
+  ];
 
   meta = {
     description = "SUMO traffic simulator";
diff --git a/pkgs/by-name/ti/tigervnc/package.nix b/pkgs/by-name/ti/tigervnc/package.nix
index f6e62e79d4f0..065b7f86b595 100644
--- a/pkgs/by-name/ti/tigervnc/package.nix
+++ b/pkgs/by-name/ti/tigervnc/package.nix
@@ -105,15 +105,12 @@ stdenv.mkDerivation (finalAttrs: {
 
       wrapProgram $out/bin/vncserver \
         --prefix PATH : ${
-          lib.makeBinPath (
-            with xorg;
-            [
-              xterm
-              twm
-              xsetroot
-              xauth
-            ]
-          )
+          lib.makeBinPath [
+            xterm
+            xorg.twm
+            xorg.xsetroot
+            xorg.xauth
+          ]
         }
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -134,27 +131,26 @@ stdenv.mkDerivation (finalAttrs: {
     ffmpeg
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux (
-    with xorg;
     [
       nettle
       pam
       perl
-      xorgproto
-      utilmacros
-      libXtst
-      libXext
-      libX11
-      libXext
-      libICE
-      libXi
-      libSM
-      libXft
-      libxkbfile
-      libXfont2
-      libpciaccess
+      xorg.xorgproto
+      xorg.utilmacros
+      xorg.libXtst
+      xorg.libXext
+      xorg.libX11
+      xorg.libXext
+      xorg.libICE
+      xorg.libXi
+      xorg.libSM
+      xorg.libXft
+      xorg.libxkbfile
+      xorg.libXfont2
+      xorg.libpciaccess
       libGLU
-      libXrandr
-      libXdamage
+      xorg.libXrandr
+      xorg.libXdamage
     ]
     ++ xorg.xorgserver.buildInputs
   );
@@ -166,12 +162,11 @@ stdenv.mkDerivation (finalAttrs: {
     automake
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux (
-    with xorg;
     [
-      fontutil
+      xorg.fontutil
       libtool
       makeWrapper
-      utilmacros
+      xorg.utilmacros
       zlib
     ]
     ++ xorg.xorgserver.nativeBuildInputs
diff --git a/pkgs/by-name/to/touchegg/package.nix b/pkgs/by-name/to/touchegg/package.nix
index 6c1a139026e9..ddb82d4895c0 100644
--- a/pkgs/by-name/to/touchegg/package.nix
+++ b/pkgs/by-name/to/touchegg/package.nix
@@ -60,16 +60,14 @@ stdenv.mkDerivation (finalAttrs: {
     pugixml
     cairo
     gtk3-x11
-  ]
-  ++ (with xorg; [
-    libX11
-    libXtst
-    libXrandr
-    libXi
-    libXdmcp
-    libpthreadstubs
-    libxcb
-  ]);
+    xorg.libX11
+    xorg.libXtst
+    xorg.libXrandr
+    xorg.libXi
+    xorg.libXdmcp
+    xorg.libpthreadstubs
+    xorg.libxcb
+  ];
 
   env.PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
 
diff --git a/pkgs/by-name/ty/typora/package.nix b/pkgs/by-name/ty/typora/package.nix
index d05f154aa131..06e15d9996d7 100644
--- a/pkgs/by-name/ty/typora/package.nix
+++ b/pkgs/by-name/ty/typora/package.nix
@@ -86,16 +86,14 @@ let
         libGL
         expat
         libxkbcommon
-      ])
-      ++ (with pkgs.xorg; [
-        libX11
-        libXcursor
-        libXrandr
-        libXcomposite
-        libXdamage
-        libXext
-        libXfixes
-        libxcb
+        xorg.libX11
+        xorg.libXcursor
+        xorg.libXrandr
+        xorg.libXcomposite
+        xorg.libXdamage
+        xorg.libXext
+        xorg.libXfixes
+        xorg.libxcb
       ]);
     runScript = ''
       Typora "$@"
diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix
index a1f8e679595c..277f172ef786 100644
--- a/pkgs/by-name/v2/v2rayn/package.nix
+++ b/pkgs/by-name/v2/v2rayn/package.nix
@@ -72,14 +72,14 @@ buildDotnetModule (finalAttrs: {
     (lib.getLib stdenv.cc.cc)
   ];
 
-  runtimeDeps = with xorg; [
-    libX11
-    libXrandr
-    libXi
-    libICE
-    libSM
-    libXcursor
-    libXext
+  runtimeDeps = [
+    xorg.libX11
+    xorg.libXrandr
+    xorg.libXi
+    xorg.libICE
+    xorg.libSM
+    xorg.libXcursor
+    xorg.libXext
   ];
 
   desktopItems = [
diff --git a/pkgs/by-name/ve/vesta-viewer/package.nix b/pkgs/by-name/ve/vesta-viewer/package.nix
index 6ee005925662..a4cb6af59f16 100644
--- a/pkgs/by-name/ve/vesta-viewer/package.nix
+++ b/pkgs/by-name/ve/vesta-viewer/package.nix
@@ -48,11 +48,9 @@ let
       gtk3
       gtk2
       temurin-jre-bin
-    ]
-    ++ (with xorg; [
-      libXxf86vm
-      libXtst
-    ]);
+      xorg.libXxf86vm
+      xorg.libXtst
+    ];
 
     src = fetchzip {
       url = "https://jp-minerals.org/vesta/archives/${version}/VESTA-gtk3.tar.bz2";
diff --git a/pkgs/by-name/vk/vk-messenger/package.nix b/pkgs/by-name/vk/vk-messenger/package.nix
index 750d270dad2b..400451755024 100644
--- a/pkgs/by-name/vk/vk-messenger/package.nix
+++ b/pkgs/by-name/vk/vk-messenger/package.nix
@@ -61,18 +61,15 @@ let
       autoPatchelfHook
       wrapGAppsHook3
     ];
-    buildInputs =
-      (with xorg; [
-        libXdamage
-        libXtst
-        libXScrnSaver
-        libxkbfile
-      ])
-      ++ [
-        gtk3
-        nss
-        alsa-lib
-      ];
+    buildInputs = [
+      xorg.libXdamage
+      xorg.libXtst
+      xorg.libXScrnSaver
+      xorg.libxkbfile
+      gtk3
+      nss
+      alsa-lib
+    ];
 
     runtimeDependencies = [
       (lib.getLib udev)
diff --git a/pkgs/by-name/we/weasis/package.nix b/pkgs/by-name/we/weasis/package.nix
index 6ba234a39bbc..26c70154b1ca 100644
--- a/pkgs/by-name/we/weasis/package.nix
+++ b/pkgs/by-name/we/weasis/package.nix
@@ -24,12 +24,10 @@ let
 
   runtimeDeps = [
     libGL
-  ]
-  ++ (with xorg; [
-    libX11
-    libXrender
-    libXxf86vm
-  ]);
+    xorg.libX11
+    xorg.libXrender
+    xorg.libXxf86vm
+  ];
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "weasis";
diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix
index e31016fafabb..7bf9ed739bbb 100644
--- a/pkgs/by-name/we/wechat-uos/package.nix
+++ b/pkgs/by-name/we/wechat-uos/package.nix
@@ -63,7 +63,7 @@ let
     preferLocalBuild = true;
   };
 
-  wechat-uos-runtime = with xorg; [
+  wechat-uos-runtime = [
     stdenv.cc.cc
     stdenv.cc.libc
     pango
@@ -72,23 +72,23 @@ let
     xcbutilimage
     xcbutilkeysyms
     xcbutilrenderutil
-    libX11
-    libXt
-    libXext
-    libSM
-    libICE
-    libxcb
+    xorg.libX11
+    xorg.libXt
+    xorg.libXext
+    xorg.libSM
+    xorg.libICE
+    xorg.libxcb
     libxkbcommon
-    libxshmfence
-    libXi
-    libXft
-    libXcursor
-    libXfixes
-    libXScrnSaver
-    libXcomposite
-    libXdamage
-    libXtst
-    libXrandr
+    xorg.libxshmfence
+    xorg.libXi
+    xorg.libXft
+    xorg.libXcursor
+    xorg.libXfixes
+    xorg.libXScrnSaver
+    xorg.libXcomposite
+    xorg.libXdamage
+    xorg.libXtst
+    xorg.libXrandr
     libnotify
     atk
     atkmm
@@ -105,7 +105,7 @@ let
     libva
     freetype
     fontconfig
-    libXrender
+    xorg.libXrender
     libuuid
     expat
     glib
diff --git a/pkgs/by-name/x2/x2vnc/package.nix b/pkgs/by-name/x2/x2vnc/package.nix
index 1fb4dedfa83a..707d4b287791 100644
--- a/pkgs/by-name/x2/x2vnc/package.nix
+++ b/pkgs/by-name/x2/x2vnc/package.nix
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
 
   env.NIX_CFLAGS_COMPILE = "-std=gnu89";
 
-  buildInputs = with xorg; [
-    libX11
-    xorgproto
-    libXext
-    libXrandr
+  buildInputs = [
+    xorg.libX11
+    xorg.xorgproto
+    xorg.libXext
+    xorg.libXrandr
   ];
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/by-name/xc/xcircuit/package.nix b/pkgs/by-name/xc/xcircuit/package.nix
index eeaba907926d..395eb0787c50 100644
--- a/pkgs/by-name/xc/xcircuit/package.nix
+++ b/pkgs/by-name/xc/xcircuit/package.nix
@@ -43,14 +43,14 @@ stdenv.mkDerivation {
     ./declare-missing-prototype.patch
   ];
 
-  buildInputs = with xorg; [
+  buildInputs = [
     cairo
     ghostscript
-    libSM
-    libXt
-    libICE
-    libX11
-    libXpm
+    xorg.libSM
+    xorg.libXt
+    xorg.libICE
+    xorg.libX11
+    xorg.libXpm
     tcl
     tk
     zlib
diff --git a/pkgs/by-name/xl/xlayoutdisplay/package.nix b/pkgs/by-name/xl/xlayoutdisplay/package.nix
index 6719948ad142..d2c1ed77e302 100644
--- a/pkgs/by-name/xl/xlayoutdisplay/package.nix
+++ b/pkgs/by-name/xl/xlayoutdisplay/package.nix
@@ -20,10 +20,10 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = with xorg; [
-    libX11
-    libXrandr
-    libXcursor
+  buildInputs = [
+    xorg.libX11
+    xorg.libXrandr
+    xorg.libXcursor
     boost
   ];
   nativeCheckInputs = [ gtest ];
diff --git a/pkgs/by-name/xl/xlife/package.nix b/pkgs/by-name/xl/xlife/package.nix
index 45e297643afe..c5519e0ddbf9 100644
--- a/pkgs/by-name/xl/xlife/package.nix
+++ b/pkgs/by-name/xl/xlife/package.nix
@@ -15,9 +15,9 @@ stdenv.mkDerivation {
     sha256 = "1gadlcp32s179kd7ypxr8cymd6s060p6z4c2vnx94i8bmiw3nn8h";
   };
 
-  nativeBuildInputs = with xorg; [
-    imake
-    gccmakedep
+  nativeBuildInputs = [
+    xorg.imake
+    xorg.gccmakedep
   ];
   buildInputs = [ xorg.libX11 ];
 
diff --git a/pkgs/by-name/xm/xmousepasteblock/package.nix b/pkgs/by-name/xm/xmousepasteblock/package.nix
index 79e165bff593..5dfbd650e64b 100644
--- a/pkgs/by-name/xm/xmousepasteblock/package.nix
+++ b/pkgs/by-name/xm/xmousepasteblock/package.nix
@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
     "PREFIX=$(out)"
     "CC=${stdenv.cc.targetPrefix}cc"
   ];
-  buildInputs = with xorg; [
-    libX11
-    libXext
-    libXi
+  buildInputs = [
+    xorg.libX11
+    xorg.libXext
+    xorg.libXi
     libev
   ];
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/xo/xosd-xft/package.nix b/pkgs/by-name/xo/xosd-xft/package.nix
index 73a71fee2062..489c53e43e88 100644
--- a/pkgs/by-name/xo/xosd-xft/package.nix
+++ b/pkgs/by-name/xo/xosd-xft/package.nix
@@ -22,10 +22,10 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
   ];
-  buildInputs = with xorg; [
-    libXft
-    libXrandr
-    libXinerama
+  buildInputs = [
+    xorg.libXft
+    xorg.libXrandr
+    xorg.libXinerama
   ];
 
   nativeInstallCheckInputs = [
diff --git a/pkgs/by-name/xp/xplugd/package.nix b/pkgs/by-name/xp/xplugd/package.nix
index ea8042e9ac69..8dbf7e6a35fa 100644
--- a/pkgs/by-name/xp/xplugd/package.nix
+++ b/pkgs/by-name/xp/xplugd/package.nix
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
     sha256 = "11vjr69prrs4ir9c267zwq4g9liipzrqi0kmw1zg95dbn7r7zmql";
   };
 
-  buildInputs = with xorg; [
-    libX11
-    libXi
-    libXrandr
-    libXext
+  buildInputs = [
+    xorg.libX11
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXext
   ];
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/xp/xpra/package.nix b/pkgs/by-name/xp/xpra/package.nix
index b2344e9477aa..f1562e55a8ac 100644
--- a/pkgs/by-name/xp/xpra/package.nix
+++ b/pkgs/by-name/xp/xpra/package.nix
@@ -126,57 +126,55 @@ effectiveBuildPythonApplication rec {
   ]
   ++ lib.optional withNvenc cudatoolkit;
 
-  buildInputs =
-    with xorg;
-    [
-      libX11
-      libXcomposite
-      libXdamage
-      libXfixes
-      libXi
-      libxkbfile
-      libXrandr
-      libXrender
-      libXres
-      libXtst
-      xorgproto
-    ]
-    ++ (with gst_all_1; [
-      gst-libav
-      gst-vaapi
-      gst-plugins-ugly
-      gst-plugins-bad
-      gst-plugins-base
-      gst-plugins-good
-      gstreamer
-    ])
-    ++ [
-      atk.out
-      cairo
-      cython
-      ffmpeg
-      gdk-pixbuf
-      glib
-      gtk3
-      libappindicator
-      librsvg
-      libvpx
-      libwebp
-      lz4
-      pam
-      pango
-      x264
-      x265
-      libavif
-      openh264
-      libyuv
-      xxHash
-      systemd
-    ]
-    ++ lib.optional withNvenc [
-      nvencHeaders
-      nvjpegHeaders
-    ];
+  buildInputs = [
+    xorg.libX11
+    xorg.libXcomposite
+    xorg.libXdamage
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libxkbfile
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libXres
+    xorg.libXtst
+    xorg.xorgproto
+  ]
+  ++ (with gst_all_1; [
+    gst-libav
+    gst-vaapi
+    gst-plugins-ugly
+    gst-plugins-bad
+    gst-plugins-base
+    gst-plugins-good
+    gstreamer
+  ])
+  ++ [
+    atk.out
+    cairo
+    cython
+    ffmpeg
+    gdk-pixbuf
+    glib
+    gtk3
+    libappindicator
+    librsvg
+    libvpx
+    libwebp
+    lz4
+    pam
+    pango
+    x264
+    x265
+    libavif
+    openh264
+    libyuv
+    xxHash
+    systemd
+  ]
+  ++ lib.optional withNvenc [
+    nvencHeaders
+    nvjpegHeaders
+  ];
 
   propagatedBuildInputs =
     with python3.pkgs;
diff --git a/pkgs/by-name/xq/xquartz/package.nix b/pkgs/by-name/xq/xquartz/package.nix
index 3a5163fcff20..7e9fe7e558cf 100644
--- a/pkgs/by-name/xq/xquartz/package.nix
+++ b/pkgs/by-name/xq/xquartz/package.nix
@@ -100,7 +100,7 @@ let
     inherit stdenv xorg fontDirs;
   };
   # any X related programs expected to be available via $PATH
-  pkgs = with xorg; [
+  pkgs = [
     # non-xorg
     quartz-wm
     xterm
@@ -108,53 +108,53 @@ let
     # xorg
     xlsfonts
     xfontsel
-    bdftopcf
-    fontutil
-    iceauth
-    libXpm
-    lndir
-    luit
-    makedepend
-    mkfontdir
-    mkfontscale
-    sessreg
-    setxkbmap
-    smproxy
-    twm
-    x11perf
-    xauth
-    xbacklight
-    xclock
-    xcmsdb
-    xcursorgen
-    xdm
-    xdpyinfo
-    xdriinfo
-    xev
-    xeyes
-    xfs
-    xgamma
-    xhost
-    xinput
-    xkbcomp
-    xkbevd
-    xkbutils
-    xkill
-    xlsatoms
-    xlsclients
-    xmessage
-    xmodmap
-    xpr
-    xprop
-    xrandr
-    xrdb
-    xrefresh
-    xset
-    xsetroot
-    xvinfo
-    xwd
-    xwininfo
-    xwud
+    xorg.bdftopcf
+    xorg.fontutil
+    xorg.iceauth
+    xorg.libXpm
+    xorg.lndir
+    xorg.luit
+    xorg.makedepend
+    xorg.mkfontdir
+    xorg.mkfontscale
+    xorg.sessreg
+    xorg.setxkbmap
+    xorg.smproxy
+    xorg.twm
+    xorg.x11perf
+    xorg.xauth
+    xorg.xbacklight
+    xorg.xclock
+    xorg.xcmsdb
+    xorg.xcursorgen
+    xorg.xdm
+    xorg.xdpyinfo
+    xorg.xdriinfo
+    xorg.xev
+    xorg.xeyes
+    xorg.xfs
+    xorg.xgamma
+    xorg.xhost
+    xorg.xinput
+    xorg.xkbcomp
+    xorg.xkbevd
+    xorg.xkbutils
+    xorg.xkill
+    xorg.xlsatoms
+    xorg.xlsclients
+    xorg.xmessage
+    xorg.xmodmap
+    xorg.xpr
+    xorg.xprop
+    xorg.xrandr
+    xorg.xrdb
+    xorg.xrefresh
+    xorg.xset
+    xorg.xsetroot
+    xorg.xvinfo
+    xorg.xwd
+    xorg.xwininfo
+    xorg.xwud
   ];
 in
 stdenv.mkDerivation {
diff --git a/pkgs/by-name/xs/xsnow/package.nix b/pkgs/by-name/xs/xsnow/package.nix
index 683b91ea075b..76c83a45473b 100644
--- a/pkgs/by-name/xs/xsnow/package.nix
+++ b/pkgs/by-name/xs/xsnow/package.nix
@@ -28,13 +28,11 @@ stdenv.mkDerivation rec {
     libxkbcommon
     libxml2
     gsl
-  ]
-  ++ (with xorg; [
-    libX11
-    libXpm
-    libXt
-    libXtst
-  ]);
+    xorg.libX11
+    xorg.libXpm
+    xorg.libXt
+    xorg.libXtst
+  ];
 
   makeFlags = [ "gamesdir=$(out)/bin" ];
 
diff --git a/pkgs/development/interpreters/python/conda/default.nix b/pkgs/development/interpreters/python/conda/default.nix
index 06421ff9b63a..ceb2cad30a71 100644
--- a/pkgs/development/interpreters/python/conda/default.nix
+++ b/pkgs/development/interpreters/python/conda/default.nix
@@ -5,25 +5,24 @@
   # When installing a conda binary package, just extend
   # the `buildInputs` with `condaAutopatchLibs`.
   condaPatchelfLibs = map (p: p.lib or p) (
+    with pkgs;
     [
-      pkgs.alsa-lib
-      pkgs.cups
-      pkgs.gcc-unwrapped
-      pkgs.libGL
+      alsa-lib
+      cups
+      gcc-unwrapped
+      libGL
+      xorg.libSM
+      xorg.libICE
+      xorg.libX11
+      xorg.libXau
+      xorg.libXdamage
+      xorg.libXi
+      xorg.libXrender
+      xorg.libXrandr
+      xorg.libXcomposite
+      xorg.libXcursor
+      xorg.libXtst
+      xorg.libXScrnSaver
     ]
-    ++ (with pkgs.xorg; [
-      libSM
-      libICE
-      libX11
-      libXau
-      libXdamage
-      libXi
-      libXrender
-      libXrandr
-      libXcomposite
-      libXcursor
-      libXtst
-      libXScrnSaver
-    ])
   );
 }
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index bd4c07d70cfd..30ca20e7e25c 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -254,45 +254,43 @@ stdenv.mkDerivation {
 
   strictDeps = true;
 
-  buildInputs =
-    with xorg;
-    [
-      directx-headers
-      elfutils
-      expat
-      spirv-tools
-      libdisplay-info
-      libdrm
-      libgbm
-      libglvnd
-      libpng
-      libunwind
-      libva-minimal
-      libX11
-      libxcb
-      libXext
-      libXfixes
-      libXrandr
-      libxshmfence
-      libXxf86vm
-      llvmPackages.clang
-      llvmPackages.clang-unwrapped
-      llvmPackages.libclc
-      llvmPackages.libllvm
-      lm_sensors
-      python3Packages.python # for shebang
-      spirv-llvm-translator
-      udev
-      vulkan-loader
-      wayland
-      wayland-protocols
-      xcbutilkeysyms
-      xorgproto
-      zstd
-    ]
-    ++ lib.optionals withValgrind [
-      valgrind-light
-    ];
+  buildInputs = [
+    directx-headers
+    elfutils
+    expat
+    spirv-tools
+    libdisplay-info
+    libdrm
+    libgbm
+    libglvnd
+    libpng
+    libunwind
+    libva-minimal
+    xorg.libX11
+    xorg.libxcb
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXrandr
+    xorg.libxshmfence
+    xorg.libXxf86vm
+    llvmPackages.clang
+    llvmPackages.clang-unwrapped
+    llvmPackages.libclc
+    llvmPackages.libllvm
+    lm_sensors
+    python3Packages.python # for shebang
+    spirv-llvm-translator
+    udev
+    vulkan-loader
+    wayland
+    wayland-protocols
+    xcbutilkeysyms
+    xorg.xorgproto
+    zstd
+  ]
+  ++ lib.optionals withValgrind [
+    valgrind-light
+  ];
 
   depsBuildBuild = [
     pkg-config
diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix
index 6fc9ae8c759a..d2a8cca574fb 100644
--- a/pkgs/development/mobile/androidenv/emulator.nix
+++ b/pkgs/development/mobile/androidenv/emulator.nix
@@ -39,21 +39,21 @@ deployAndroidPackage {
         waylandpp.lib
       ]
     )
-    ++ (with pkgs.xorg; [
-      libX11
-      libXext
-      libXdamage
-      libXfixes
-      libxcb
-      libXcomposite
-      libXcursor
-      libXi
-      libXrender
-      libXtst
-      libICE
-      libSM
-      libxkbfile
-      libxshmfence
+    ++ (with pkgs; [
+      xorg.libX11
+      xorg.libXext
+      xorg.libXdamage
+      xorg.libXfixes
+      xorg.libxcb
+      xorg.libXcomposite
+      xorg.libXcursor
+      xorg.libXi
+      xorg.libXrender
+      xorg.libXtst
+      xorg.libICE
+      xorg.libSM
+      xorg.libxkbfile
+      xorg.libxshmfence
     ])
     ++ lib.optional (os == "linux" && stdenv.isx86_64) pkgsi686Linux.glibc;
   patchInstructions =
diff --git a/pkgs/development/mobile/androidenv/tools.nix b/pkgs/development/mobile/androidenv/tools.nix
index 0ed6bc86b544..4534e52daa4f 100644
--- a/pkgs/development/mobile/androidenv/tools.nix
+++ b/pkgs/development/mobile/androidenv/tools.nix
@@ -24,11 +24,9 @@ deployAndroidPackage {
       fontconfig
       fontconfig.lib
       stdenv.cc.cc.libgcc or null # fix for https://github.com/NixOS/nixpkgs/issues/226357
-    ])
-    ++ (with pkgs.xorg; [
-      libX11
-      libXrender
-      libXext
+      xorg.libX11
+      xorg.libXrender
+      xorg.libXext
     ])
     ++ lib.optionals (os == "linux" && stdenv.isx86_64) (
       with pkgsi686Linux;
diff --git a/pkgs/tools/admin/turbovnc/default.nix b/pkgs/tools/admin/turbovnc/default.nix
index b12bec21ab26..566793985bbc 100644
--- a/pkgs/tools/admin/turbovnc/default.nix
+++ b/pkgs/tools/admin/turbovnc/default.nix
@@ -74,23 +74,21 @@ stdenv.mkDerivation (finalAttrs: {
     openssl
     pam
     perl
-  ]
-  ++ (with xorg; [
-    libfontenc # for -DTVNC_SYSTEMX11=1
-    libSM
-    libX11
-    libXdamage # for -DTVNC_SYSTEMX11=1
-    libXdmcp # for -DTVNC_SYSTEMX11=1
-    libXext
-    libXfont2 # for -DTVNC_SYSTEMX11=1
-    libxkbfile # for -DTVNC_SYSTEMX11=1
-    libxshmfence
-    libXi
+    xorg.libfontenc # for -DTVNC_SYSTEMX11=1
+    xorg.libSM
+    xorg.libX11
+    xorg.libXdamage # for -DTVNC_SYSTEMX11=1
+    xorg.libXdmcp # for -DTVNC_SYSTEMX11=1
+    xorg.libXext
+    xorg.libXfont2 # for -DTVNC_SYSTEMX11=1
+    xorg.libxkbfile # for -DTVNC_SYSTEMX11=1
+    xorg.libxshmfence
+    xorg.libXi
     mesa-gl-headers # for -DTVNC_SYSTEMX11=1
-    pixman # for -DTVNC_SYSTEMX11=1
-    xorgproto
-    xtrans # for -DTVNC_SYSTEMX11=1
-  ]);
+    xorg.pixman # for -DTVNC_SYSTEMX11=1
+    xorg.xorgproto
+    xorg.xtrans # for -DTVNC_SYSTEMX11=1
+  ];
 
   postPatch = ''
     substituteInPlace unix/Xvnc/CMakeLists.txt --replace 'string(REGEX REPLACE "X11" "Xfont2" X11_Xfont2_LIB' 'set(X11_Xfont2_LIB ${xorg.libXfont2}/lib/libXfont2.so)  #'
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 3f6c1aea1c95..d5133e0ffc91 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     pango
     bash
   ]
-  ++ optionals withXorg (with xorg; [ libXrender ]);
+  ++ optionals withXorg [ xorg.libXrender ];
 
   hardeningDisable = [ "fortify" ];
 
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index ae4917f9996b..afc18f99c2c6 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -751,17 +751,15 @@ rec {
       core # kpathsea
       freetype
       ghostscript
-    ]
-    ++ (with xorg; [
-      libX11
-      libXaw
-      libXi
-      libXpm
-      libXmu
-      libXaw
-      libXext
-      libXfixes
-    ]);
+      xorg.libX11
+      xorg.libXaw
+      xorg.libXi
+      xorg.libXpm
+      xorg.libXmu
+      xorg.libXaw
+      xorg.libXext
+      xorg.libXfixes
+    ];
 
     preConfigure = "cd texk/xdvik";
 
diff --git a/pkgs/top-level/nim-overrides.nix b/pkgs/top-level/nim-overrides.nix
index 4e45ddf5cff3..3c16a740adee 100644
--- a/pkgs/top-level/nim-overrides.nix
+++ b/pkgs/top-level/nim-overrides.nix
@@ -105,13 +105,11 @@
       ...
     }:
     {
-      buildInputs =
-        buildInputs
-        ++ (with xorg; [
-          libX11
-          libXft
-          libXinerama
-        ]);
+      buildInputs = buildInputs ++ [
+        xorg.libX11
+        xorg.libXft
+        xorg.libXinerama
+      ];
     };
 
   zippy =