diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 3a523469248..d7b0eb0ed6f 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -926,7 +926,7 @@ let
       url = mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2;
       sha256 = "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h";
     };
-    buildInputs = [pkgconfig libfontenc ];
+    buildInputs = [pkgconfig libfontenc ]; configureFlags = "--disable-selective-werror"; 
   })) // {inherit libfontenc ;};
 
   makedepend = (stdenv.mkDerivation ((if overrides ? makedepend then overrides.makedepend else x: x) {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 04ee5f10961..1d294845f7f 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -177,6 +177,12 @@ while (<>) {
         $extraAttrs{$pkg} = " configureFlags = \"--with-fontrootdir=\$(out)/lib/X11/fonts\"; ";
     }
 
+    if ($tarball =~ /\/luit-/) {
+        # See https://bugs.freedesktop.org/show_bug.cgi?id=47792
+        # Once the bug is fixed upstream, this can be removed.
+        $extraAttrs{$pkg} = " configureFlags = \"--disable-selective-werror\"; ";
+    }
+
     sub process {
         my $requires = shift;
         my $s = shift;