mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
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:
parent
8120292b21
commit
24c70760cd
@ -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
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -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;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user