diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-07 15:22:35 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-07 15:22:35 +0100 |
| commit | 5f554279ec31e8d42266a3f4477035fa8e43a5c7 (patch) | |
| tree | 0edb6eea939ec15ed533ca44b4d26ff4b97aea21 /pkgs/stdenv/linux/default.nix | |
| parent | 13ee78018cc0ebb8ff0ae25b6d86c9c273fd55b9 (diff) | |
| parent | cb2a447c510848c925977c0ecc440eef7443c12f (diff) | |
| download | nixpkgs-5f554279ec31e8d42266a3f4477035fa8e43a5c7.tar nixpkgs-5f554279ec31e8d42266a3f4477035fa8e43a5c7.tar.gz nixpkgs-5f554279ec31e8d42266a3f4477035fa8e43a5c7.tar.bz2 nixpkgs-5f554279ec31e8d42266a3f4477035fa8e43a5c7.tar.lz nixpkgs-5f554279ec31e8d42266a3f4477035fa8e43a5c7.tar.xz nixpkgs-5f554279ec31e8d42266a3f4477035fa8e43a5c7.tar.zst nixpkgs-5f554279ec31e8d42266a3f4477035fa8e43a5c7.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/stdenv/linux/default.nix')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index cfba5e7b88a..28c3b9f3fb4 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -4,7 +4,7 @@ # compiler and linker that do not search in default locations, # ensuring purity of components produced by it. { lib -, localSystem, crossSystem, config, overlays +, localSystem, crossSystem, config, overlays, crossOverlays ? [] , bootstrapFiles ? let table = { @@ -32,7 +32,7 @@ in files }: -assert crossSystem == null; +assert crossSystem == localSystem; let inherit (localSystem) system platform; |