From e97f8fecfa10ad04448f9cf54a1f0277f668cf4e Mon Sep 17 00:00:00 2001 From: Astro Date: Tue, 26 Sep 2023 13:57:46 +0200 Subject: [PATCH] rust-hypervisor-firmware: fix build (#257345) Co-authored-by: Yureka --- .../rust-hypervisor-firmware/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix index 152bb056bc55..ddb06a97f162 100644 --- a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix +++ b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix @@ -1,8 +1,9 @@ { lib , fetchFromGitHub -, makeRustPlatform , hostPlatform , targetPlatform +, cargo +, rustc , lld }: @@ -24,7 +25,12 @@ let }; }; - inherit (cross) rustPlatform; + # inherit (cross) rustPlatform; + # ^ breaks because we are doing a no_std embedded build with a custom sysroot, + # but the fast_cross rustc wrapper already passes a sysroot argument + rustPlatform = cross.makeRustPlatform { + inherit rustc cargo; + }; in