Merge branch 'stdenv-updates' into pi-stdenv-updates

Conflicts: pkgs/development/compilers/gcc/4.6/default.nix pkgs/development/compilers/gcc/4.7/default.nix The 4.7 had some weird parameters added in crossAttrs; I've removed them, but I don't understand where they come from.
2012-12-28 20:14:01 +00:00
parent f2f50c42d2 88b11196c1
commit 719ba63004
417 changed files with 838 additions and 853 deletions
@@ -39,7 +39,7 @@ stdenv.mkDerivation ({
  inherit kernelHeaders installLocales;

  # The host/target system.
-  crossConfig = if (cross != null) then cross.config else null;
+  crossConfig = if cross != null then cross.config else null;

  inherit (stdenv) is64bit;