mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-28 22:32:58 +03:00
GCJ 4.4: More X dependencies.
svn path=/nixpkgs/trunk/; revision=16503
This commit is contained in:
parent
9ddd85f356
commit
cf229e4156
@ -10,7 +10,7 @@
|
||||
, zlib ? null, boehmgc ? null
|
||||
, 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
|
||||
, libXrender ? null, xproto ? null, renderproto ? null
|
||||
, enableMultilib ? false
|
||||
, name ? "gcc"
|
||||
}:
|
||||
@ -30,7 +30,11 @@ let version = "4.4.1";
|
||||
url = "ftp://sourceware.org/pub/java/ecj-4.3.jar";
|
||||
sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx";
|
||||
};
|
||||
xlibs = [ libX11 libXt libSM libICE libXtst libXrender xproto ];
|
||||
|
||||
xlibs = [
|
||||
libX11 libXt libSM libICE libXtst libXrender xproto renderproto
|
||||
];
|
||||
|
||||
javaAwtGtk = langJava && gtk != null;
|
||||
|
||||
in
|
||||
|
@ -1736,7 +1736,7 @@ let
|
||||
inherit zip unzip zlib boehmgc gettext pkgconfig;
|
||||
inherit (gtkLibs) gtk;
|
||||
inherit (gnome) libart_lgpl;
|
||||
inherit (xlibs) libX11 libXt libSM libICE libXtst libXrender xproto;
|
||||
inherit (xlibs) libX11 libXt libSM libICE libXtst libXrender xproto renderproto;
|
||||
});
|
||||
|
||||
#ghc = haskellPackages.ghc;
|
||||
|
Loading…
Reference in New Issue
Block a user