Author: viric Date: 2010-06-14 21:40:11 +0000 (Mon, 14 Jun 2010) New Revision: 22267
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22267&view=rev Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix Log: Reverting r22258. I got confused; we don't need a new gcc build in stdenvLinux, but an up to date ppl package (because the current does not build with such a new gmp) Changes: Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix 2010-06-14 18:42:52 UTC (rev 22266) +++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix 2010-06-14 21:40:11 UTC (rev 22267) @@ -132,12 +132,7 @@ stdenv = stdenvLinuxBoot0; }; - # Helper function to override the compiler in stdenv for specific packages. - overrideGCC = stdenv: gcc: stdenv // - { mkDerivation = args: stdenv.mkDerivation (args // { NIX_GCC = gcc; }); - }; - # Create the first "real" standard environment. This one consists # of bootstrap tools only, and a minimal Glibc to keep the GCC # configure script happy. @@ -185,17 +180,6 @@ stdenvLinuxBoot2Pkgs = allPackages { inherit system; bootStdenv = stdenvLinuxBoot2; - config = { - packageOverrides = pkgs : { - # The stdenv's gcc will not be built with 'ppl' - # but the resulting 'gcc' attribute of these pkgs will. - # (that allows bootstrapping from bootstrapTools with old gmp) - stdenv = overrideGCC pkgs.stdenv (pkgs.wrapGCC (pkgs.gcc.gcc.override { - ppl = null; - cloogppl = null; - })); - }; - }; }; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
