From 032c603c8bd35e1ac381cd8654fb802560e3f984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 27 Jul 2009 23:09:04 +0000
Subject: [PATCH] GCJ 4.4: Try to avoid FastJar since it appears to be broken.

svn path=/nixpkgs/trunk/; revision=16486
---
 pkgs/development/compilers/gcc-4.4/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix
index 17e712dc115..3219060e908 100644
--- a/pkgs/development/compilers/gcc-4.4/default.nix
+++ b/pkgs/development/compilers/gcc-4.4/default.nix
@@ -7,14 +7,14 @@
 , gmp, mpfr, gettext, which
 , ppl ? null, cloogppl ? null  # used by the Graphite optimization framework
 , bison ? null, flex ? null
-, fastjar ? null, zlib ? null, boehmgc ? null
+, zlib ? null, boehmgc ? null
 , zip ? null, unzip ? null
 , enableMultilib ? false
 , name ? "gcc"
 }:
 
 assert langTreelang -> bison != null && flex != null;
-assert langJava     -> fastjar != null && zip != null && unzip != null;
+assert langJava     -> zip != null && unzip != null;
 
 with stdenv.lib;
 
@@ -69,7 +69,7 @@ stdenv.mkDerivation ({
     ++ (optionals langTreelang [bison flex])
     ++ (optional (zlib != null) zlib)
     ++ (optional (boehmgc != null) boehmgc)
-    ++ (optionals langJava [fastjar zip unzip])
+    ++ (optionals langJava [zip unzip])
     ;
 
   configureFlags = "
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd047643131..7bc528ddd81 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1743,7 +1743,7 @@ let
     langCC = true;
     langC = false;
     profiledCompiler = false;
-    inherit fastjar zip unzip zlib boehmgc gettext;
+    inherit zip unzip zlib boehmgc gettext;
   });
 
   #ghc = haskellPackages.ghc;