GCJ 4.4: Provide InfoZIP; remove FastJar hack; don't build C; provide which(1).

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

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

@@ -4,16 +4,17 @@
 , profiledCompiler ? false
 , staticCompiler ? false
 , texinfo ? null
-, gmp, mpfr, gettext
+, gmp, mpfr, gettext, which
 , ppl ? null, cloogppl ? null  # used by the Graphite optimization framework
 , bison ? null, flex ? null
 , fastjar ? null, zlib ? null, boehmgc ? null
+, zip ? null, unzip ? null
 , enableMultilib ? false
 , name ? "gcc"
 }:
 
 assert langTreelang -> bison != null && flex != null;
-assert langJava     -> fastjar != null;
+assert langJava     -> fastjar != null && zip != null && unzip != null;
 
 with stdenv.lib;
 
@@ -32,16 +33,6 @@ in
 stdenv.mkDerivation ({
   name = "${name}-${version}";
 
-  preConfigure =
-    if langJava
-    then ''
-      # Make sure a `jar' executable is in the search path.
-      ensureDir "bin"
-      ln -sv "${fastjar}/bin/fastjar" "bin/jar"
-      export PATH="$PWD/bin:$PATH"
-    ''
-    else "";
-
   builder = ./builder.sh;
   
   src =
@@ -72,13 +63,13 @@ stdenv.mkDerivation ({
 
   inherit noSysDirs profiledCompiler staticCompiler langJava;
 
-  buildInputs = [ texinfo gmp mpfr gettext ]
+  buildInputs = [ texinfo gmp mpfr gettext which ]
     ++ (optional (ppl != null) ppl)
     ++ (optional (cloogppl != null) cloogppl)
     ++ (optionals langTreelang [bison flex])
     ++ (optional (zlib != null) zlib)
     ++ (optional (boehmgc != null) boehmgc)
-    ++ (optional langJava fastjar)
+    ++ (optionals langJava [fastjar zip unzip])
     ;
 
   configureFlags = "

pkgs/top-level/all-packages.nix

@@ -1669,7 +1669,7 @@ let
 
   gcc44 = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.4) {
     inherit fetchurl stdenv texinfo gmp mpfr ppl cloogppl
-      gettext noSysDirs;
+      gettext which noSysDirs;
     profiledCompiler = true;
   });
 
@@ -1741,9 +1741,9 @@ let
     langJava = true;
     langFortran = false;
     langCC = true;
-    langC = true;
+    langC = false;
     profiledCompiler = false;
-    inherit fastjar zlib boehmgc gettext;
+    inherit fastjar zip unzip zlib boehmgc gettext;
   });
 
   #ghc = haskellPackages.ghc;