GCJ 4.4: Fix missing <X11/extensions/XInput.h> by adding `libXi'.

That header used to be provided by inputproto-1.4 but is no longer
provided by inputproto-2.0.

svn path=/nixpkgs/trunk/; revision=18164

2 files changed, 3 insertions, 3 deletions

diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix
index 25beaeb20bd4..40dd6f49f767 100644
--- a/pkgs/development/compilers/gcc-4.4/default.nix
+++ b/pkgs/development/compilers/gcc-4.4/default.nix
@@ -11,7 +11,7 @@
 , zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null
 , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
 , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
-, libXrandr ? null, inputproto ? null, randrproto ? null
+, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
 , enableMultilib ? false
 , name ? "gcc"
 }:
@@ -40,7 +40,7 @@ let version = "4.4.2";
     };
 
     xlibs = [
-      libX11 libXt libSM libICE libXtst libXrender libXrandr
+      libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
       xproto renderproto xextproto inputproto randrproto
     ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9dd461dab655..f35fb9223cce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1934,7 +1934,7 @@ let
     inherit zip unzip zlib boehmgc gettext pkgconfig;
     inherit (gtkLibs) gtk;
     inherit (gnome) libart_lgpl;
-    inherit (xlibs) libX11 libXt libSM libICE libXtst libXrender
+    inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender
       libXrandr xproto renderproto xextproto inputproto randrproto;
   });