diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix index 3219060e908..5ab466038e0 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bc528ddd81..f6732623ac1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1743,7 +1743,8 @@ let langCC = true; langC = false; profiledCompiler = false; - inherit zip unzip zlib boehmgc gettext; + inherit zip unzip zlib boehmgc gettext pkgconfig; + inherit (gtkLibs) gtk; }); #ghc = haskellPackages.ghc;