about summary refs log tree commit diff
path: root/pkgs/applications/virtualization
diff options
context:
space:
mode:
authorAstro <astro@spaceboyz.net>2023-09-26 13:57:46 +0200
committerGitHub <noreply@github.com>2023-09-26 13:57:46 +0200
commite97f8fecfa10ad04448f9cf54a1f0277f668cf4e (patch)
treed47d723e5775969b96bd2a81aa874ef7c8c08391 /pkgs/applications/virtualization
parent0019463360b3931871c62f2099ed84b48748b9aa (diff)
downloadnixlib-e97f8fecfa10ad04448f9cf54a1f0277f668cf4e.tar
nixlib-e97f8fecfa10ad04448f9cf54a1f0277f668cf4e.tar.gz
nixlib-e97f8fecfa10ad04448f9cf54a1f0277f668cf4e.tar.bz2
nixlib-e97f8fecfa10ad04448f9cf54a1f0277f668cf4e.tar.lz
nixlib-e97f8fecfa10ad04448f9cf54a1f0277f668cf4e.tar.xz
nixlib-e97f8fecfa10ad04448f9cf54a1f0277f668cf4e.tar.zst
nixlib-e97f8fecfa10ad04448f9cf54a1f0277f668cf4e.zip
rust-hypervisor-firmware: fix build (#257345)
Co-authored-by: Yureka <yuka@yuka.dev>
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r--pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix10
1 files 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