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

GCJ 4.4: More X dependencies (soon it will be all over, well I hope soon).

Browse Source 
svn path=/nixpkgs/trunk/; revision=16512
This commit is contained in:
Ludovic Courtès 2009-07-29 20:47:12 +00:00
parent 4456c7496a
commit a2e9613540
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +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
, inputproto ? null
, enableMultilib ? false , enableMultilib ? false
, name ? "gcc" , name ? "gcc"
}: }:
@ -33,7 +34,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 xextproto inputproto
]; ];
javaAwtGtk = langJava && gtk != null; javaAwtGtk = langJava && gtk != null;

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

@ -1737,7 +1737,7 @@ let
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 libXrender
xproto renderproto xextproto; xproto renderproto xextproto inputproto;
}); });
#ghc = haskellPackages.ghc; #ghc = haskellPackages.ghc;