diff options
| author | John Ericson <jericson@galois.com> | 2016-11-30 18:51:13 -0500 |
|---|---|---|
| committer | John Ericson <jericson@galois.com> | 2016-12-01 11:24:33 -0500 |
| commit | 4751d9e5ad124284dbd719d3a58f42d56f1b9514 (patch) | |
| tree | 60531fd147f913face4de51a78c12ae9cc1dd18a /pkgs/stdenv/custom | |
| parent | a55d1ecc9050a50904a13e3a34535990b9e61ae3 (diff) | |
top-level: turn the screw
- Non-cross stdenvs are honest and assert that `crossSystem` is null
- `crossSystem` is a mandatory argument to top-level/stage.nix, just like
`system` and `platform`
- Broken default arguments on stdenvs for testing are gone.
- All stdenvs (but little-used stdenvNix) take the same arguments for easy
testing.
Diffstat (limited to 'pkgs/stdenv/custom')
| -rw-r--r-- | pkgs/stdenv/custom/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix index 174b8593c0aa..188d00277731 100644 --- a/pkgs/stdenv/custom/default.nix +++ b/pkgs/stdenv/custom/default.nix @@ -2,6 +2,8 @@ , system, platform, crossSystem, config }: +assert crossSystem == null; + rec { vanillaStdenv = import ../. { inherit lib allPackages system platform crossSystem; |