From 0d0be1387869f8ddc84a9548fc327015b7745ec4 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 23 Sep 2015 12:29:44 -0700 Subject: [PATCH] rustUnstable: Don't depend on a stable rust compiler --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a225ba1cc6d..823fa1f849f 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