[nix] fix online driver exection

Signed-off-by: Avimitin <dev@avimit.in>
chipsalliance · Jan 22, 2025 · 8e1834e · 8e1834e
1 parent 5cae2a2
commit 8e1834e
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/nix/t1/run/run-emulator.nix b/nix/t1/run/run-emulator.nix
@@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation (lib.recursiveUpdate
   dontUnpack = true;
 
   emuDriverArgs = assert lib.assertMsg (!(emulator ? enableProfile && emulator.enableProfile)) "The provided emulator has `profile` feature enable, which is inherently nondetermistic, use '.<...attr path...>.profile --impure' instead";
-    lib.escapeShellArgs emuDriverArgs;
+    toString emuDriverArgs;
 
   passthru = {
     # to open 'profileReport.html' in firefox,
@@ -68,11 +68,12 @@ stdenvNoCC.mkDerivation (lib.recursiveUpdate
       exit 1
     }
 
-    echo "[nix] Running VCS for $caseName with args $emuDriverArgs"
+    driverPhase="${lib.getExe emulator} $emuDriverArgs"
+    echo "[nix] Running '$driverPhase'"
     export RUST_BACKTRACE=full
     rtlEventOutPath="$out/$caseName-rtl-event.jsonl"
 
-    if ! "${lib.getExe emulator}" $emuDriverArgs \
+    if ! eval "$driverPhase"  \
       1> >(tee $out/online-drive-emu-journal) \
       2>$rtlEventOutPath
     then