GCJ 4.4: Require various X libraries.

svn path=/nixpkgs/trunk/; revision=16492

pkgs/development/compilers/gcc-4.4/default.nix

@@ -9,7 +9,7 @@
 , bison ? null, flex ? null
 , zlib ? null, boehmgc ? null
 , zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null
-, libXtst ? null
+, libX11 ? null, libSM ? null, libICE ? null, libXtst ? null
 , enableMultilib ? false
 , name ? "gcc"
 }:
@@ -17,7 +17,8 @@
 assert langTreelang -> bison != null && flex != null;
 assert langJava     -> zip != null && unzip != null;
 assert gtk != null  -> pkgconfig != null && libart_lgpl != null
-                       && libXtst != null;
+                       && libX11 != null && libSM != null
+                       && libICE != null && libXtst != null;
 
 with stdenv.lib;
 
@@ -73,7 +74,8 @@ stdenv.mkDerivation ({
     ++ (optional (zlib != null) zlib)
     ++ (optional (boehmgc != null) boehmgc)
     ++ (optionals langJava [zip unzip])
-    ++ (optionals (gtk != null) [gtk pkgconfig libart_lgpl libXtst])
+    ++ (optionals (gtk != null)
+         [gtk pkgconfig libart_lgpl libX11 libSM libICE libXtst])
     ;
 
   configureFlags = "

pkgs/top-level/all-packages.nix

@@ -1736,7 +1736,7 @@ let
     inherit zip unzip zlib boehmgc gettext pkgconfig;
     inherit (gtkLibs) gtk;
     inherit (gnome) libart_lgpl;
-    inherit (xlibs) libXtst;
+    inherit (xlibs) libX11 libSM libICE libXtst;
   });
 
   #ghc = haskellPackages.ghc;