diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index ed021da80c0..41fa4828455 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1149,7 +1149,8 @@ rec {
   };
 
   mesa = (import ../development/libraries/mesa) {
-    inherit fetchurl stdenv xlibs;
+    inherit fetchurl stdenv x11;
+    inherit (xlibs) libXmu libXi;
   };
 
   chmlib = (import ../development/libraries/chmlib) {