From b5553b7cec004afc53cdf2e0b71119aa1bd9d929 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Tue, 23 Jul 2013 20:30:31 -0700
Subject: [PATCH] luit: fix build with newer gcc (close #734)

---
 pkgs/servers/x11/xorg/default.nix                    | 2 +-
 pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 6 ------
 pkgs/servers/x11/xorg/overrides.nix                  | 6 ++++++
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index d7b0eb0ed6f..3a523469248 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 ]; configureFlags = "--disable-selective-werror"; 
+    buildInputs = [pkgconfig libfontenc ];
   })) // {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 1d294845f7f..04ee5f10961 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -177,12 +177,6 @@ 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;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 22e0096ad65..65e788aa2a1 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -85,6 +85,12 @@ in
     propagatedBuildInputs = [ xorg.libSM ];
   };
 
+  # See https://bugs.freedesktop.org/show_bug.cgi?id=47792
+  # Once the bug is fixed upstream, this can be removed.
+  luit = attrs: attrs // {
+    configureFlags = "--disable-selective-werror";
+  };
+
   compositeproto = attrs: attrs // {
     propagatedBuildInputs = [ xorg.fixesproto ];
   };