From c9049f71ddac49e4ed7c92d2a45cbe375c00ec4b Mon Sep 17 00:00:00 2001
From: Robin Stumm <serverkorken@gmail.com>
Date: Wed, 18 Aug 2021 15:45:28 +0200
Subject: [PATCH] rust.toRustTarget: fix for windows

change vendor from "w64" to "pc"
broken since 91718534f1f476a727b51a256c93885e57cf602d

(cherry picked from commit d89c29deb8ae6baa96443caa3857c2039b3ab86d)
---
 pkgs/development/compilers/rust/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index c90f689e21c..b48791f11b7 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -37,8 +37,11 @@
       "armv6l" = "arm";
       "armv5tel" = "armv5te";
     }.${cpu.name} or cpu.name;
+    vendor_ = platform.rustc.platform.vendor or {
+      "w64" = "pc";
+    }.${vendor.name} or vendor.name;
   in platform.rustc.config
-    or "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}";
+    or "${cpu_}-${vendor_}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}";
 
   # Returns the name of the rust target if it is standard, or the json file
   # containing the custom target spec.