From 8feb395f427efd1f4e40b61b48c82f0bf0ef3efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 27 Jul 2009 10:46:23 +0000
Subject: [PATCH] GCJ 4.4: Depend on FastJar, needed during the bootstrap
 phase.

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

diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix
index 9ce3fa599f95..4624af92957e 100644
--- a/pkgs/development/compilers/gcc-4.4/default.nix
+++ b/pkgs/development/compilers/gcc-4.4/default.nix
@@ -7,12 +7,13 @@
 , gmp, mpfr, gettext
 , ppl ? null, cloogppl ? null  # used by the Graphite optimization framework
 , bison ? null, flex ? null
-, zlib ? null, boehmgc ? null
+, fastjar ? null, zlib ? null, boehmgc ? null
 , enableMultilib ? false
 , name ? "gcc"
 }:
 
 assert langTreelang -> bison != null && flex != null;
+assert langJava     -> fastjar != null;
 
 with stdenv.lib;
 
@@ -67,6 +68,7 @@ stdenv.mkDerivation ({
     ++ (optionals langTreelang [bison flex])
     ++ (optional (zlib != null) zlib)
     ++ (optional (boehmgc != null) boehmgc)
+    ++ (optional langJava fastjar)
     ;
 
   configureFlags = "
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a82dd5e794c5..cd748b76b8ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1743,7 +1743,7 @@ let
     langCC = true;
     langC = true;
     profiledCompiler = false;
-    inherit zlib boehmgc gettext;
+    inherit fastjar zlib boehmgc gettext;
   });
 
   #ghc = haskellPackages.ghc;