diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix index 85a3aee4c89..9ec2c485992 100644 --- a/pkgs/development/compilers/gcc-4.4/default.nix +++ b/pkgs/development/compilers/gcc-4.4/default.nix @@ -221,7 +221,9 @@ stdenv.mkDerivation ({ ]; # Volunteers needed for the {Cyg,Dar}win ports of *PPL. - platforms = stdenv.lib.platforms.linux ++ [ "i686-darwin" ]; + # gnatboot is not available out of linux platforms, so we disable the darwin build + # for the gnat (ada compiler). + platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false) [ "i686-darwin" ]; }; } // (if langVhdl then rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a75aeb7b391..56fd9f3c6ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1974,8 +1974,8 @@ let cross = assert crossSystem != null; crossSystem; }; - gcc44_realCross = lib.addMetaAttrs { platforms = []; } ( - makeOverridable (import ../development/compilers/gcc-4.4) { + gcc44_realCross = lib.addMetaAttrs { platforms = []; } + (makeOverridable (import ../development/compilers/gcc-4.4) { inherit stdenv fetchurl texinfo gmp mpfr ppl cloogppl noSysDirs gettext which; binutilsCross = binutilsCross; @@ -1990,12 +1990,13 @@ let }); gccCrossStageStatic = wrapGCCCross { - gcc = forceBuildDrv (gcc44_realCross.override { + gcc = forceBuildDrv (lib.addMetaAttrs { platforms = []; } ( + gcc44_realCross.override { crossStageStatic = true; langCC = false; libcCross = null; enableShared = true; - }); + })); libc = null; binutils = binutilsCross; cross = assert crossSystem != null; crossSystem;