Revert "Merge pull request #229 from viric/niximpure2-stdenv-updates"

This reverts commit e04b17bfba, reversing
changes made to 1af2ada7d4.
This commit is contained in:
Eelco Dolstra
2012-12-28 15:46:45 +01:00
parent 095db9fe3f
commit 6fd4f63530
4 changed files with 2 additions and 13 deletions
+1 -4
View File
@@ -94,7 +94,6 @@ rec {
initialPath = [bootstrapTools] ++ extraPath;
fetchurlBoot = fetchurl;
inherit gcc;
withNixImpure = if platform ? nixImpure then platform.nixImpure else false;
# Having the proper 'platform' in all the stdenvs allows getting proper
# linuxHeaders for example.
extraAttrs = extraAttrs // { inherit platform; };
@@ -265,7 +264,7 @@ rec {
inherit system;
preHook = commonPreHook;
initialPath =
((import ../common-path.nix) {pkgs = stdenvLinuxBoot4Pkgs;})
++ [stdenvLinuxBoot4Pkgs.patchelf];
@@ -282,8 +281,6 @@ rec {
shell = stdenvLinuxBoot4Pkgs.bash + "/bin/bash";
fetchurlBoot = fetchurl;
withNixImpure = if platform ? nixImpure then platform.nixImpure else false;
extraAttrs = {
inherit (stdenvLinuxBoot3Pkgs) glibc;