diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-05 10:15:00 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-05 10:15:00 +0100 |
commit | 60a3973a55f0574bf3f11303cb1dbc20a8bb6d70 (patch) | |
tree | 2040f2d41050694da9b2431eb1b7adc8719a425c /pkgs/stdenv/native/default.nix | |
parent | aca57f1aed4068ee374d51b211844972dcb0192f (diff) | |
parent | d9707792b5e1af8999ddcb790b8b1b06305dd186 (diff) | |
download | nixpkgs-60a3973a55f0574bf3f11303cb1dbc20a8bb6d70.tar nixpkgs-60a3973a55f0574bf3f11303cb1dbc20a8bb6d70.tar.gz nixpkgs-60a3973a55f0574bf3f11303cb1dbc20a8bb6d70.tar.bz2 nixpkgs-60a3973a55f0574bf3f11303cb1dbc20a8bb6d70.tar.lz nixpkgs-60a3973a55f0574bf3f11303cb1dbc20a8bb6d70.tar.xz nixpkgs-60a3973a55f0574bf3f11303cb1dbc20a8bb6d70.tar.zst nixpkgs-60a3973a55f0574bf3f11303cb1dbc20a8bb6d70.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/stdenv/native/default.nix')
-rw-r--r-- | pkgs/stdenv/native/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 810cf16301f..ba53a6f1d14 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -1,5 +1,5 @@ { lib -, localSystem, crossSystem, config, overlays +, localSystem, crossSystem, config, overlays, crossOverlays ? [] }: assert crossSystem == localSystem; |