From 9e93a9cf39edf23936127baeebe050e11e83fd86 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Tue, 14 May 2019 19:17:16 +0800
Subject: [PATCH] rustc: make llvm override compatible with nixos-unstable

---
 derivations.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/derivations.nix b/derivations.nix
index e63f131..3f65097 100644
--- a/derivations.nix
+++ b/derivations.nix
@@ -23,6 +23,11 @@ rec {
   rustc = (pkgs.rustc.overrideAttrs(oa: {
     name = "${oa.pname}-${oa.version}-riscv";
     patches = oa.patches ++ [ ./compilers/rustc-riscv32i.patch ];
-  })).override { inherit llvm_7; };
+  })).override {
+    inherit llvm_7;
+    pkgsBuildBuild = pkgs.pkgsBuildBuild // { inherit llvm_7; };
+    pkgsBuildHost = pkgs.pkgsBuildHost // { inherit llvm_7; };
+    pkgsBuildTarget = pkgs.pkgsBuildTarget // { inherit llvm_7; };
+  };
   rust-riscv32i-crates = pkgs.callPackage ./compilers/rust-riscv32i-crates.nix { inherit rustc; };
 }