diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2009-07-28 08:11:10 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2009-07-28 08:11:10 +0000 |
| commit | f9f44ed564f1ebbdd0495d72f8a103a010d50c9f (patch) | |
| tree | b66b12d5dc8e18c5369840eb056e22659ab9fb83 /pkgs/development/compilers | |
| parent | 032c603c8bd35e1ac381cd8654fb802560e3f984 (diff) | |
GCJ 4.4: Build the GTK+ AWT peer.
svn path=/nixpkgs/trunk/; revision=16487
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/gcc-4.4/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix index 3219060e90870..5ab466038e0ae 100644 --- a/pkgs/development/compilers/gcc-4.4/default.nix +++ b/pkgs/development/compilers/gcc-4.4/default.nix @@ -8,13 +8,14 @@ , ppl ? null, cloogppl ? null # used by the Graphite optimization framework , bison ? null, flex ? null , zlib ? null, boehmgc ? null -, zip ? null, unzip ? null +, zip ? null, unzip ? null, gtk ? null, pkgconfig ? null , enableMultilib ? false , name ? "gcc" }: assert langTreelang -> bison != null && flex != null; assert langJava -> zip != null && unzip != null; +assert gtk != null -> pkgconfig != null; with stdenv.lib; @@ -70,6 +71,7 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ++ (optional (boehmgc != null) boehmgc) ++ (optionals langJava [zip unzip]) + ++ (optionals (gtk != null) [gtk pkgconfig]) ; configureFlags = " @@ -77,6 +79,7 @@ stdenv.mkDerivation ({ ${if ppl != null then "--with-ppl=${ppl}" else ""} ${if cloogppl != null then "--with-cloog=${cloogppl}" else ""} ${if langJava then "--with-ecj-jar=${javaEcj}" else ""} + ${if (langJava && gtk != null) then "--enable-java-awt=gtk" else ""} --disable-libstdcxx-pch --without-included-gettext --with-system-zlib |