derivations.nix

@@ -21,13 +21,8 @@ rec {
     cmakeFlags = oa.cmakeFlags ++ ["-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=RISCV"];
   });
   rustc = (pkgs.rustc.overrideAttrs(oa: {
-    name = "${oa.pname}-${oa.version}-riscv";
+    name = oa.name + "-riscv";
     patches = oa.patches ++ [ ./compilers/rustc-riscv32i.patch ];
-  })).override {
-    inherit llvm_7;
-    pkgsBuildBuild = pkgs.pkgsBuildBuild // { inherit llvm_7; };
-    pkgsBuildHost = pkgs.pkgsBuildHost // { inherit llvm_7; };
-    pkgsBuildTarget = pkgs.pkgsBuildTarget // { inherit llvm_7; };
-  };
+  })).override { inherit llvm_7; };
   rust-riscv32i-crates = pkgs.callPackage ./compilers/rust-riscv32i-crates.nix { inherit rustc; };
 }