Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix toRustTarget for windows #134946

Merged
merged 2 commits into from
Aug 20, 2021
Merged

fix toRustTarget for windows #134946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d89c29d
rust.toRustTarget: fix for windows
dermetfan Aug 18, 2021
3bdfca4
buildRustPackage: remove unused parameter
dermetfan Aug 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pkgs/build-support/rust/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
, importCargoLock
, rustPlatform
, callPackage
, remarshal
, git
, rust
, rustc
Expand Down
5 changes: 4 additions & 1 deletion pkgs/development/compilers/rust/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,11 @@
"armv5tel" = "armv5te";
"riscv64" = "riscv64gc";
}.${cpu.name} or cpu.name;
vendor_ = platform.rustc.platform.vendor or {
"w64" = "pc";
}.${vendor.name} or vendor.name;
nrdxp marked this conversation as resolved.
Show resolved Hide resolved
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.
Expand Down