gtk3: make x11Support actually disable X11 dependencies

pkgs/development/libraries/gtk/3.x.nix

@@ -129,27 +129,35 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-scanner
   ];
 
-  buildInputs = [
+  buildInputs =
-    libxkbcommon
+    lib.optionals (x11Support || waylandSupport) [
-    (libepoxy.override { inherit x11Support; })
+      # TODO: Reorder me on `staging`.
-    isocodes
+      libxkbcommon
-  ]
+    ]
-  ++ lib.optionals trackerSupport [
+    ++ [
-    tinysparql
+      (libepoxy.override { inherit x11Support; })
-  ];
+    ]
+    ++ lib.optionals (x11Support || waylandSupport) [
+      isocodes
+    ]
+    ++ lib.optionals trackerSupport [
+      tinysparql
+    ];
   #TODO: colord?
 
-  propagatedBuildInputs =
+  propagatedBuildInputs = [
+    at-spi2-atk
+    atk
+    cairo
+    expat
+    fribidi
+    gdk-pixbuf
+    glib
+    gsettings-desktop-schemas
+  ]
+  ++ lib.optionals x11Support (
     with xorg;
     [
-      at-spi2-atk
-      atk
-      cairo
-      expat
-      fribidi
-      gdk-pixbuf
-      glib
-      gsettings-desktop-schemas
       libICE
       libSM
       libXcomposite
@@ -159,19 +167,23 @@ stdenv.mkDerivation (finalAttrs: {
       libXi
       libXrandr
       libXrender
-      pango
     ]
-    ++ lib.optionals waylandSupport [
+  )
-      libGL
+  ++ [
-      wayland
+    # TODO: Reorder me on `staging`.
-      wayland-protocols
+    pango
-    ]
+  ]
-    ++ lib.optionals xineramaSupport [
+  ++ lib.optionals waylandSupport [
-      libXinerama
+    libGL
-    ]
+    wayland
-    ++ lib.optionals cupsSupport [
+    wayland-protocols
-      cups
+  ]
-    ];
+  ++ lib.optionals xineramaSupport [
+    xorg.libXinerama
+  ]
+  ++ lib.optionals cupsSupport [
+    cups
+  ];
 
   mesonFlags = [
     "-Dgtk_doc=${lib.boolToString withIntrospection}"