diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-21 18:26:08 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-21 18:40:41 -0400 |
| commit | c03571107213331494fb5330fd2bb4129d19cdbc (patch) | |
| tree | e69519422b92fce01c39f00bf537ed9b20e9ce72 /pkgs/stdenv/nix | |
| parent | 0ab717d5478dd608fe4e167016451e73d25d5469 (diff) | |
| download | nixlib-c03571107213331494fb5330fd2bb4129d19cdbc.tar nixlib-c03571107213331494fb5330fd2bb4129d19cdbc.tar.gz nixlib-c03571107213331494fb5330fd2bb4129d19cdbc.tar.bz2 nixlib-c03571107213331494fb5330fd2bb4129d19cdbc.tar.lz nixlib-c03571107213331494fb5330fd2bb4129d19cdbc.tar.xz nixlib-c03571107213331494fb5330fd2bb4129d19cdbc.tar.zst nixlib-c03571107213331494fb5330fd2bb4129d19cdbc.zip | |
cc-wrapper: Remove unused params
Ensured hashes unchanged and eval succeeds in tarball job
Diffstat (limited to 'pkgs/stdenv/nix')
| -rw-r--r-- | pkgs/stdenv/nix/default.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index aaf6c523ea4a..c736442dc0a4 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -13,12 +13,10 @@ bootStages ++ [ inherit config overlays; stdenv = import ../generic rec { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; - inherit config; + inherit (prevStage.stdenv) buildPlatform hostPlatform targetPlatform; + preHook = '' export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}" export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}" @@ -27,8 +25,6 @@ bootStages ++ [ initialPath = (import ../common-path.nix) { pkgs = prevStage; }; - inherit (prevStage.stdenv) hostPlatform targetPlatform; - cc = import ../../build-support/cc-wrapper { nativeTools = false; nativePrefix = stdenv.lib.optionalString hostPlatform.isSunOS "/usr"; |