diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-09-23 12:29:44 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-09-23 12:30:00 -0700 |
| commit | 0d0be1387869f8ddc84a9548fc327015b7745ec4 (patch) | |
| tree | c1503f1b4cb78d5f28f2cbd2f63cae69c1cbb0c0 | |
| parent | de2906e6706c6c342f016906865026cb443d96a1 (diff) | |
rustUnstable: Don't depend on a stable rust compiler
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a225ba1cc6dbd..823fa1f849fd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4669,10 +4669,12 @@ let rustPlatform = rustStable; rustStable = recurseIntoAttrs (makeRustPlatform rustc cargo rustStable); - rustUnstable = recurseIntoAttrs (makeRustPlatform rustcMaster cargo rustUnstable); + rustUnstable = recurseIntoAttrs (makeRustPlatform rustcMaster + (cargo.override { rustPlatform = rustUnstableCargoPlatform; }) rustUnstable); # rust platform to build cargo itself (with cargoSnapshot) rustCargoPlatform = makeRustPlatform rustc cargoSnapshot.cargo rustCargoPlatform; + rustUnstableCargoPlatform = makeRustPlatform rustcMaster cargoSnapshot.cargo rustUnstableCargoPlatform; makeRustPlatform = rustc: cargo: self: let |