[nix] tweak vcs link

chipsalliance · Jul 21, 2024 · c3f9e8d · c3f9e8d
1 parent db3ba2f
commit c3f9e8d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/difftest/vcs-emu.nix b/difftest/vcs-emu.nix
@@ -7,7 +7,7 @@
 , rust-analyzer
 , rust-bindgen
 
-, vcs-fhs-env
+, vcStaticInstallPath
 , vcs-lib
 
 , cmake
@@ -41,7 +41,7 @@ let
     buildFeatures = lib.optionals vcs-lib.enable-trace [ "trace" ];
 
     env = {
-      VCS_LIB_DIR = "${vcs-fhs-env.vcStaticInstallPath}/vcs-mx/lib/linux64/lib";
+      VCS_LIB_DIR = "${vcStaticInstallPath}/vcs-mx/lib/linux64/lib";
       VCS_COMPILED_LIB_DIR = "${vcs-lib}";
       DESIGN_VLEN = elaborateConfig.parameter.vLen;
       DESIGN_DLEN = elaborateConfig.parameter.dLen;

diff --git a/nix/pkgs/vcs-fhs-env.nix b/nix/pkgs/vcs-fhs-env.nix
@@ -6,8 +6,6 @@
 }:
 buildFHSEnv {
   name = "vcs-fhs-env";
-  # used by other derivations to access vcs lib
-  vcStaticInstallPath = vcStaticInstallPath;
   profile = ''
     export TCL_TZ=UTC
     export VC_STATIC_HOME=${vcStaticInstallPath}

diff --git a/nix/t1/default.nix b/nix/t1/default.nix
@@ -117,8 +117,8 @@ lib.makeScope newScope
           };
           vcs-emu-compiled = innerSelf.callPackage ./vcs.nix { rtl = vcs-emu-rtl; };
           vcs-emu-compiled-trace = innerSelf.callPackage ./vcs.nix { rtl = vcs-emu-rtl; enable-trace = true; };
-          vcs-emu = innerSelf.callPackage ../../difftest/vcs-emu.nix { vcs-lib = vcs-emu-compiled; };
-          vcs-emu-trace = innerSelf.callPackage ../../difftest/vcs-emu.nix { vcs-lib = vcs-emu-compiled-trace; };
+          vcs-emu = innerSelf.callPackage ../../difftest/vcs-emu.nix { vcs-lib = vcs-emu-compiled; vcStaticInstallPath = builtins.getEnv "VC_STATIC_HOME"; };
+          vcs-emu-trace = innerSelf.callPackage ../../difftest/vcs-emu.nix { vcs-lib = vcs-emu-compiled-trace; vcStaticInstallPath = builtins.getEnv "VC_STATIC_HOME"; };
         };
 
         subsystem = rec {