diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index b26936de9777..7568ec0de158 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -279,23 +279,24 @@ self = stdenv.mkDerivation {
   buildInputs = with xorg; [
     expat
     glslang
-    llvmPackages.libllvm
-    libglvnd
-    xorgproto
-    libX11
-    libXext
-    libxcb
-    libXt
-    libXfixes
-    libxshmfence
-    libXrandr
     libffi
+    libglvnd
     libvdpau
-    libXvMC
-    libpthreadstubs
+    llvmPackages.libllvm
     openssl
     zstd
-  ] ++ lib.optionals withLibunwind [
+  ] ++ (with xorg; [
+    libX11
+    libXext
+    libXfixes
+    libXrandr
+    libXt
+    libXvMC
+    libpthreadstubs
+    libxcb
+    libxshmfence
+    xorgproto
+  ]) ++ lib.optionals withLibunwind [
     libunwind
   ] ++ [
     python3Packages.python # for shebang
@@ -305,8 +306,8 @@ self = stdenv.mkDerivation {
   ] ++ lib.optionals stdenv.isLinux [
     libomxil-bellagio
     libva-minimal
-    udev
     lm_sensors
+    udev
   ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
     elfutils
   ] ++ lib.optionals enableOpenCL [
@@ -353,10 +354,10 @@ self = stdenv.mkDerivation {
     wayland-scanner
   ];
 
-  propagatedBuildInputs = with xorg; [
+  propagatedBuildInputs = (with xorg; [
     libXdamage
     libXxf86vm
-  ] ++ lib.optionals withLibdrm [
+  ]) ++ lib.optionals withLibdrm [
     libdrm
   ] ++ lib.optionals stdenv.isDarwin [
     OpenGL