[nix] fix generated filelist

Signed-off-by: Avimitin <[email protected]>
chipsalliance · Aug 22, 2024 · abb182d · abb182d
1 parent 8dfef77
commit abb182d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/nix/t1/rtl.nix b/nix/t1/rtl.nix
@@ -22,9 +22,11 @@ stdenvNoCC.mkDerivation {
     firtool ${mlirbc}/${mlirbc.elaborateTarget}-${mlirbc.elaborateConfig}-lowered.mlirbc \
       -o $out ${mfcArgs}
   '' + lib.optionalString fixupFilelist ''
+    # FIXME: https://github.com/llvm/circt/pull/7543
     echo "Fixing generated filelist.f"
-    cat $out/firrtl_black_box_resource_files.f >> $out/filelist.f
-    rm $out/firrtl_black_box_resource_files.f
+    pushd $out
+    find . -mindepth 1 -name '*.sv' -type f > $out/filelist.f
+    popd
   '';
 
   meta.description = "All the elaborated system verilog files for ${mlirbc.elaborateTarget} with ${mlirbc.elaborateConfig} config.";

diff --git a/nix/t1/verilated.nix b/nix/t1/verilated.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation {
       --timing \
       --threads 8 \
       -O1 \
+      -F filelist.f \
       --cc TestBench
 
     echo "[nix] building verilated C lib"