From a5a5cbe93d1003326cfe43dc1666e27f2db84df8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 28 Jul 2009 09:23:40 +0000
Subject: [PATCH] GCJ 4.4: Require libart.

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

diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix
index e3272bc1c58..bd4793757c8 100644
--- a/pkgs/development/compilers/gcc-4.4/default.nix
+++ b/pkgs/development/compilers/gcc-4.4/default.nix
@@ -8,14 +8,14 @@
 , ppl ? null, cloogppl ? null  # used by the Graphite optimization framework
 , bison ? null, flex ? null
 , zlib ? null, boehmgc ? null
-, zip ? null, unzip ? null, gtk ? null, pkgconfig ? null
+, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null
 , enableMultilib ? false
 , name ? "gcc"
 }:
 
 assert langTreelang -> bison != null && flex != null;
 assert langJava     -> zip != null && unzip != null;
-assert gtk != null  -> pkgconfig != null;
+assert gtk != null  -> pkgconfig != null && libart_lgpl != null;
 
 with stdenv.lib;
 
@@ -71,7 +71,7 @@ stdenv.mkDerivation ({
     ++ (optional (zlib != null) zlib)
     ++ (optional (boehmgc != null) boehmgc)
     ++ (optionals langJava [zip unzip])
-    ++ (optionals (gtk != null) [gtk pkgconfig])
+    ++ (optionals (gtk != null) [gtk pkgconfig libart_lgpl])
     ;
 
   configureFlags = "
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4edb2bfd92c..fa3aa2a89cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1735,6 +1735,7 @@ let
     profiledCompiler = false;
     inherit zip unzip zlib boehmgc gettext pkgconfig;
     inherit (gtkLibs) gtk;
+    inherit (gnome) libart_lgpl;
   });
 
   #ghc = haskellPackages.ghc;