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
This commit is contained in:
Ludovic Courtès 2009-11-05 21:43:00 +00:00
parent 8120292b21
commit 24c70760cd
2 changed files with 3 additions and 3 deletions

View File

@ -11,7 +11,7 @@
, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null , zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? 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 , enableMultilib ? false
, name ? "gcc" , name ? "gcc"
}: }:
@ -40,7 +40,7 @@ let version = "4.4.2";
}; };
xlibs = [ xlibs = [
libX11 libXt libSM libICE libXtst libXrender libXrandr libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
xproto renderproto xextproto inputproto randrproto xproto renderproto xextproto inputproto randrproto
]; ];

View File

@ -1934,7 +1934,7 @@ let
inherit zip unzip zlib boehmgc gettext pkgconfig; inherit zip unzip zlib boehmgc gettext pkgconfig;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
inherit (gnome) libart_lgpl; 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; libXrandr xproto renderproto xextproto inputproto randrproto;
}); });