From 70455de76d1564a711d1d16caf3ef66063340641 Mon Sep 17 00:00:00 2001
From: Val Lorentz <progval+git+nix@progval.net>
Date: Sat, 8 Apr 2023 10:56:35 +0200
Subject: [PATCH] mrustc-bootstrap: Recompile minicargo

---
 pkgs/development/compilers/mrustc/bootstrap.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/mrustc/bootstrap.nix b/pkgs/development/compilers/mrustc/bootstrap.nix
index 40aac0f159c..95c4ec04037 100644
--- a/pkgs/development/compilers/mrustc/bootstrap.nix
+++ b/pkgs/development/compilers/mrustc/bootstrap.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
   makeFlags = [
     # Use shared mrustc/minicargo/llvm instead of rebuilding them
     "MRUSTC=${mrustc}/bin/mrustc"
-    "MINICARGO=${mrustc-minicargo}/bin/minicargo"
+    #"MINICARGO=${mrustc-minicargo}/bin/minicargo"  # FIXME: uncomment this so minicargo doesn't get rebuilt
     "LLVM_CONFIG=${llvm_12.dev}/bin/llvm-config"
     "RUSTC_TARGET=${rust.toRustTarget stdenv.targetPlatform}"
   ];
@@ -89,6 +89,7 @@ stdenv.mkDerivation rec {
     export OUTDIR_SUF=-${rustcVersion}
     export RUSTC_VERSION=${rustcVersion}
     export MRUSTC_TARGET_VER=${mrustcTargetVersion}
+    export MRUSTC_PATH=${mrustc}/bin/mrustc
 
     echo minicargo.mk: libs
     make -f minicargo.mk "''${flagsArray[@]}" LIBS