[nix] add post install for offline

This could help fixing the naming issue when distribute to downstream nix script. Signed-off-by: Avimitin <[email protected]>
chipsalliance · Sep 9, 2024 · 805d53e · 805d53e
1 parent 0590cb6
commit 805d53e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/difftest/default.nix b/difftest/default.nix
@@ -49,6 +49,11 @@ rustPlatform.buildRustPackage {
     lockFile = ./Cargo.lock;
   };
 
+  postInstall = lib.optionalString (lib.hasPrefix "offline" moduleType) ''
+    exe=$(find $out/bin -type f -name 'offline_*')
+    ln -s "$exe" $out/bin/offline
+  '';
+
   passthru = {
     dpiLibPath = "/lib/libdpi_${moduleType}.a";
     inherit enableTrace;

diff --git a/nix/t1/run/run-vcs-emu.nix b/nix/t1/run/run-vcs-emu.nix
@@ -59,8 +59,8 @@ stdenvNoCC.mkDerivation (finalAttr: {
       "ERROR"
     )
     offlineCheckArgs="''${offlineCheckArgsArray[@]}"
-    echo -e "[nix] running offline check: \033[0;34m${emulator}/bin/offline_t1 $offlineCheckArgs\033[0m"
-    "${offline-checker}/bin/offline_t1" $offlineCheckArgs &> >(tee $out/offline-check-journal)
+    echo -e "[nix] running offline check: \033[0;34m${emulator}/bin/offline $offlineCheckArgs\033[0m"
+    "${offline-checker}/bin/offline" $offlineCheckArgs &> >(tee $out/offline-check-journal)
 
     printf "$?" > $out/offline-check-status
     if [ "$(cat $out/offline-check-status)" != "0" ]; then

diff --git a/nix/t1/run/run-verilator-emu.nix b/nix/t1/run/run-verilator-emu.nix
@@ -56,8 +56,8 @@ stdenvNoCC.mkDerivation (finalAttr: {
       "info"
     )
     offlineCheckArgs="''${offlineCheckArgsArray[@]}"
-    echo -e "[nix] running offline check: \033[0;34m${offline-checker}/bin/offline_t1 $offlineCheckArgs\033[0m"
-    "${offline-checker}/bin/offline_t1" $offlineCheckArgs &> $out/offline-check-journal
+    echo -e "[nix] running offline check: \033[0;34m${offline-checker}/bin/offline $offlineCheckArgs\033[0m"
+    "${offline-checker}/bin/offline" $offlineCheckArgs &> $out/offline-check-journal
 
     printf "$?" > $out/offline-check-status
     if [ "$(cat $out/offline-check-status)" != "0" ]; then

diff --git a/script/emu/src/Main.scala b/script/emu/src/Main.scala
@@ -312,7 +312,7 @@ object Main:
 
     val offlineChecker = os.Path(
       resolveNixPath(s".#t1.${finalConfig}.ip.offline-checker")
-    ) / "bin" / (if finalConfig == "t1rocket" then "offline_t1rocket" else "offline_t1")
+    ) / "bin" / "offline"
 
     val elfFile =
       if caseAttr.isDefined then resolveTestElfPath(finalConfig, caseAttr.get).toString