public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GCJ 4.4: More X dependencies.

Browse Source 
svn path=/nixpkgs/trunk/; revision=16503
This commit is contained in:
Ludovic Courtès 2009-07-29 16:18:31 +00:00
parent 9ddd85f356
commit cf229e4156
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/compilers/gcc-4.4/default.nix
View File

@ -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 , libXrender ? null, xproto ? null, renderproto ? null
, enableMultilib ? false , enableMultilib ? false
, name ? "gcc" , name ? "gcc"
}: }:
@ -30,7 +30,11 @@ let version = "4.4.1";
url = "ftp://sourceware.org/pub/java/ecj-4.3.jar"; url = "ftp://sourceware.org/pub/java/ecj-4.3.jar";
sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx"; sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx";
}; };
xlibs = [ libX11 libXt libSM libICE libXtst libXrender xproto ];
xlibs = [
libX11 libXt libSM libICE libXtst libXrender xproto renderproto
];
javaAwtGtk = langJava && gtk != null; javaAwtGtk = langJava && gtk != null;
in in

2
pkgs/top-level/all-packages.nix
View File

@ -1736,7 +1736,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 xproto; inherit (xlibs) libX11 libXt libSM libICE libXtst libXrender xproto renderproto;
}); });
#ghc = haskellPackages.ghc; #ghc = haskellPackages.ghc;