[nix] move spike_interface attr to top

This pkg doesn't require any configuration. Signed-off-by: Avimitin <[email protected]>
chipsalliance · Jul 27, 2024 · e4c9477 · e4c9477
1 parent 5b64083
commit e4c9477
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/difftest/default.nix b/difftest/default.nix
@@ -1,5 +1,6 @@
 { lib
 , libspike
+, libspike_interfaces
 , callPackage
 , elaborateConfig
 
@@ -15,8 +16,6 @@
 }:
 
 let
-  spike_interfaces = callPackage ./spike_interfaces { };
-
   self = rustPlatform.buildRustPackage {
     name = "difftest";
     src = with lib.fileset; toSource {
@@ -32,7 +31,7 @@ let
     };
 
     buildInputs = [
-      spike_interfaces
+      libspike_interfaces
       verilated
     ];
 
@@ -47,7 +46,7 @@ let
       VERILATED_INC_DIR = "${verilated}/include";
       VERILATED_LIB_DIR = "${verilated}/lib";
       SPIKE_LIB_DIR = "${libspike}/lib";
-      SPIKE_INTERFACES_LIB_DIR = "${spike_interfaces}/lib";
+      SPIKE_INTERFACES_LIB_DIR = "${libspike_interfaces}/lib";
       DESIGN_VLEN = elaborateConfig.parameter.vLen;
       DESIGN_DLEN = elaborateConfig.parameter.dLen;
     };
@@ -66,7 +65,7 @@ let
           clang-tools
         ];
       });
-      inherit spike_interfaces;
+      inherit libspike_interfaces;
     };
   };
 in

diff --git a/nix/overlay.nix b/nix/overlay.nix
@@ -18,6 +18,7 @@ rec {
   espresso = final.callPackage ./pkgs/espresso.nix { };
   dramsim3 = final.callPackage ./pkgs/dramsim3.nix { };
   libspike = final.callPackage ./pkgs/libspike.nix { };
+  libspike_interfaces = final.callPackage ../difftest/spike_interfaces { };
   buddy-mlir = final.callPackage ./pkgs/buddy-mlir.nix { };
   fetchMillDeps = final.callPackage ./pkgs/mill-builder.nix { };
   circt-full = final.callPackage ./pkgs/circt-full.nix { };