public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GCJ 4.4: Build the GTK+ AWT peer.

Browse Source 
svn path=/nixpkgs/trunk/; revision=16487
This commit is contained in:
Ludovic Courtès 2009-07-28 08:11:10 +00:00
parent 032c603c8b
commit f9f44ed564
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/gcc-4.4/default.nix
View File

@ -8,13 +8,14 @@
, ppl ? null, cloogppl ? null # used by the Graphite optimization framework , ppl ? null, cloogppl ? null # used by the Graphite optimization framework
, bison ? null, flex ? null , bison ? null, flex ? null
, zlib ? null, boehmgc ? null , zlib ? null, boehmgc ? null
, zip ? null, unzip ? null , zip ? null, unzip ? null, gtk ? null, pkgconfig ? null
, enableMultilib ? false , enableMultilib ? false
, name ? "gcc" , name ? "gcc"
}: }:
assert langTreelang -> bison != null && flex != null; assert langTreelang -> bison != null && flex != null;
assert langJava -> zip != null && unzip != null; assert langJava -> zip != null && unzip != null;
assert gtk != null -> pkgconfig != null;
with stdenv.lib; with stdenv.lib;
@ -70,6 +71,7 @@ stdenv.mkDerivation ({
++ (optional (zlib != null) zlib) ++ (optional (zlib != null) zlib)
++ (optional (boehmgc != null) boehmgc) ++ (optional (boehmgc != null) boehmgc)
++ (optionals langJava [zip unzip]) ++ (optionals langJava [zip unzip])
++ (optionals (gtk != null) [gtk pkgconfig])
; ;
configureFlags = " configureFlags = "
@ -77,6 +79,7 @@ stdenv.mkDerivation ({
${if ppl != null then "--with-ppl=${ppl}" else ""} ${if ppl != null then "--with-ppl=${ppl}" else ""}
${if cloogppl != null then "--with-cloog=${cloogppl}" else ""} ${if cloogppl != null then "--with-cloog=${cloogppl}" else ""}
${if langJava then "--with-ecj-jar=${javaEcj}" else ""} ${if langJava then "--with-ecj-jar=${javaEcj}" else ""}
${if (langJava && gtk != null) then "--enable-java-awt=gtk" else ""}
--disable-libstdcxx-pch --disable-libstdcxx-pch
--without-included-gettext --without-included-gettext
--with-system-zlib --with-system-zlib

3
pkgs/top-level/all-packages.nix
View File

@ -1743,7 +1743,8 @@ let
langCC = true; langCC = true;
langC = false; langC = false;
profiledCompiler = false; profiledCompiler = false;
inherit zip unzip zlib boehmgc gettext; inherit zip unzip zlib boehmgc gettext pkgconfig;
inherit (gtkLibs) gtk;
}); });
#ghc = haskellPackages.ghc; #ghc = haskellPackages.ghc;