mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 18:03:04 +00:00
GCJ 4.4: More X dependencies (it's never enough).
svn path=/nixpkgs/trunk/; revision=16510
This commit is contained in:
parent
14b71e6b1d
commit
6e75b20d46
@ -10,7 +10,7 @@
|
|||||||
, zlib ? null, boehmgc ? null
|
, zlib ? null, boehmgc ? null
|
||||||
, 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
|
, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
|
||||||
, enableMultilib ? false
|
, enableMultilib ? false
|
||||||
, name ? "gcc"
|
, name ? "gcc"
|
||||||
}:
|
}:
|
||||||
@ -33,6 +33,7 @@ let version = "4.4.1";
|
|||||||
|
|
||||||
xlibs = [
|
xlibs = [
|
||||||
libX11 libXt libSM libICE libXtst libXrender xproto renderproto
|
libX11 libXt libSM libICE libXtst libXrender xproto renderproto
|
||||||
|
xextproto
|
||||||
];
|
];
|
||||||
|
|
||||||
javaAwtGtk = langJava && gtk != null;
|
javaAwtGtk = langJava && gtk != null;
|
||||||
|
@ -1736,7 +1736,8 @@ 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 xproto renderproto;
|
inherit (xlibs) libX11 libXt libSM libICE libXtst libXrender
|
||||||
|
xproto renderproto xextproto;
|
||||||
});
|
});
|
||||||
|
|
||||||
#ghc = haskellPackages.ghc;
|
#ghc = haskellPackages.ghc;
|
||||||
|
Loading…
Reference in New Issue
Block a user