diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-06-14 21:40:11 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-06-14 21:40:11 +0000 |
commit | d30ede1a13642bffce7643f8f32be5c58f8b4f44 (patch) | |
tree | 237439c1719857b06ddfb659ec9e52433a825165 /pkgs/stdenv/linux | |
parent | 0feaada94a35c3041757f53d4e6532a2aff0244c (diff) | |
download | nixlib-d30ede1a13642bffce7643f8f32be5c58f8b4f44.tar nixlib-d30ede1a13642bffce7643f8f32be5c58f8b4f44.tar.gz nixlib-d30ede1a13642bffce7643f8f32be5c58f8b4f44.tar.bz2 nixlib-d30ede1a13642bffce7643f8f32be5c58f8b4f44.tar.lz nixlib-d30ede1a13642bffce7643f8f32be5c58f8b4f44.tar.xz nixlib-d30ede1a13642bffce7643f8f32be5c58f8b4f44.tar.zst nixlib-d30ede1a13642bffce7643f8f32be5c58f8b4f44.zip |
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) svn path=/nixpkgs/branches/stdenv-updates/; revision=22267
Diffstat (limited to 'pkgs/stdenv/linux')
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 2a58a9de0cf3..dd5647bec456 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -132,11 +132,6 @@ rec { 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 @@ -185,17 +180,6 @@ rec { 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; - })); - }; - }; }; |