diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-28 15:46:45 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-28 15:46:45 +0100 |
| commit | 6fd4f635300303906fd4b068b196b8e1310b9e6d (patch) | |
| tree | c68f829bb8972d78984b2e9f40462f21497bf73c /pkgs/stdenv/linux | |
| parent | 095db9fe3f221b7ed91df5a426b42df172f69420 (diff) | |
| download | nixlib-6fd4f635300303906fd4b068b196b8e1310b9e6d.tar nixlib-6fd4f635300303906fd4b068b196b8e1310b9e6d.tar.gz nixlib-6fd4f635300303906fd4b068b196b8e1310b9e6d.tar.bz2 nixlib-6fd4f635300303906fd4b068b196b8e1310b9e6d.tar.lz nixlib-6fd4f635300303906fd4b068b196b8e1310b9e6d.tar.xz nixlib-6fd4f635300303906fd4b068b196b8e1310b9e6d.tar.zst nixlib-6fd4f635300303906fd4b068b196b8e1310b9e6d.zip | |
Revert "Merge pull request #229 from viric/niximpure2-stdenv-updates"
This reverts commit e04b17bfbaa4dbd5252d59f727d7d84ffe25f568, reversing changes made to 1af2ada7d4c61e79356a0f3f8bcced6159a6e751.
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 73768e8f40e7..3105e76f8177 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -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; |