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=16516
This commit is contained in:
Ludovic Courtès 2009-07-30 08:32:43 +00:00
parent 2e8e54fbbc
commit 0b46ac126b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 , libXrandr ? null, inputproto ? null, randrproto ? null
, enableMultilib ? false , enableMultilib ? false
, name ? "gcc" , name ? "gcc"
}: }:
@ -34,7 +34,7 @@ let version = "4.4.1";
xlibs = [ xlibs = [
libX11 libXt libSM libICE libXtst libXrender libXrandr libX11 libXt libSM libICE libXtst libXrender libXrandr
xproto renderproto xextproto inputproto xproto renderproto xextproto inputproto randrproto
]; ];
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
libXrandr xproto renderproto xextproto inputproto; libXrandr xproto renderproto xextproto inputproto randrproto;
}); });
#ghc = haskellPackages.ghc; #ghc = haskellPackages.ghc;