diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix index 90eabe9e7a41..a7233693a6bf 100644 --- a/pkgs/development/compilers/gcc-4.6/default.nix +++ b/pkgs/development/compilers/gcc-4.6/default.nix @@ -203,16 +203,15 @@ stdenv.mkDerivation ({ libcCross crossMingw; buildNativeInputs = [ texinfo which ] - ++ optional (perl != null) perl; - + ++ optional langJava perl; + buildInputs = [ gmp mpfr mpc libelf gettext ] ++ (optional (ppl != null) ppl) ++ (optional (cloogppl != null) cloogppl) ++ (optional (cloog != null) cloog) ++ (optionals langTreelang [bison flex]) ++ (optional (zlib != null) zlib) - ++ (optional (boehmgc != null) boehmgc) - ++ (optionals langJava [zip unzip]) + ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk [gtk pkgconfig libart_lgpl] ++ xlibs) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0539baac6e81..6c8e6a70323d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1733,11 +1733,15 @@ let profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true; })); - gcc46_real = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.6) { - inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib perl - cloog gettext which noSysDirs; + gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc-4.6 { + inherit noSysDirs; + cross = null; + libcCross = null; + binutilsCross = null; + ppl = ppl0_11; - + cloogppl = null; + # bootstrapping a profiled compiler does not work in the sheevaplug: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true;