Author: viric Date: 2010-06-15 11:55:19 +0000 (Tue, 15 Jun 2010) New Revision: 22274
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22274&view=rev Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Log: Fixing the attributes of gcc44 and gcc45, so the proper one is taken from stdenv Changes: Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix 2010-06-15 11:32:19 UTC (rev 22273) +++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix 2010-06-15 11:55:19 UTC (rev 22274) @@ -2067,8 +2067,6 @@ profiledCompiler = false; }); - gcc44 = useFromStdenv "gcc" gcc44_real; - gcc43 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.3) { inherit stdenv fetchurl texinfo gmp mpfr noSysDirs; profiledCompiler = true; @@ -2096,6 +2094,8 @@ cross = assert crossSystem != null; crossSystem; }); + gcc45 = useFromStdenv "gcc" gcc45_real; + gcc45_realCross = lib.addMetaAttrs { platforms = []; } (makeOverridable (import ../development/compilers/gcc-4.5) { inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib @@ -2154,13 +2154,13 @@ enableMultilib = true; })); - gcc44_real = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.4) { + gcc44 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.4) { inherit fetchurl stdenv texinfo gmp mpfr /* ppl cloogppl */ gettext which noSysDirs; profiledCompiler = true; })); - gcc45 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.5) { + gcc45_real = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.5) { inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib perl ppl cloogppl gettext which noSysDirs; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
