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/darwin | |
parent | a55d1ecc9050a50904a13e3a34535990b9e61ae3 (diff) | |
download | nixlib-4751d9e5ad124284dbd719d3a58f42d56f1b9514.tar nixlib-4751d9e5ad124284dbd719d3a58f42d56f1b9514.tar.gz nixlib-4751d9e5ad124284dbd719d3a58f42d56f1b9514.tar.bz2 nixlib-4751d9e5ad124284dbd719d3a58f42d56f1b9514.tar.lz nixlib-4751d9e5ad124284dbd719d3a58f42d56f1b9514.tar.xz nixlib-4751d9e5ad124284dbd719d3a58f42d56f1b9514.tar.zst nixlib-4751d9e5ad124284dbd719d3a58f42d56f1b9514.zip |
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/darwin')
-rw-r--r-- | pkgs/stdenv/darwin/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 6182c8cc0c74..b9044f25cd7a 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -1,7 +1,5 @@ -{ system ? builtins.currentSystem -, allPackages ? import ../../.. -, platform ? null -, config ? {} +{ lib, allPackages +, system, platform, crossSystem, config # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools , bootstrapFiles ? let @@ -17,6 +15,8 @@ } }: +assert crossSystem == null; + let libSystemProfile = '' (import "${./standard-sandbox.sb}") @@ -100,7 +100,7 @@ in rec { }; thisPkgs = allPackages { - inherit system platform config; + inherit system platform crossSystem config; allowCustomOverrides = false; stdenv = thisStdenv; }; |