Added missing Nix packages, fixed exec sourcing for Nix in flow/Makefile.

Signed-off-by: Ryan Slawson <[email protected]>

Author: rslawson

flake.nix

@@ -24,9 +24,11 @@
         buildInputs = [
           openroad.packages.${system}.default
           yosys.packages.${system}.default
+          pkgs.time
           pkgs.klayout
           pkgs.verilator
-	  pkgs.python3
+          pkgs.perl
+          pkgs.python3
           pkgs.python3Packages.pandas
           pkgs.python3Packages.numpy
           pkgs.python3Packages.firebase-admin

flow/Makefile

@@ -232,24 +232,24 @@ endif
 # Priority is given to
 #       1 user explicit set with variable in Makefile or command line, for instance setting OPENROAD_EXE
 #       2 ORFS compiled tools: openroad, yosys
-ifneq (${IN_NIX_SHELL}, "")
-  export OPENROAD_EXE := $(shell which openroad)
+ifneq (${IN_NIX_SHELL},)
+  export OPENROAD_EXE := $(shell command -v openroad)
 else
   export OPENROAD_EXE ?= $(abspath $(FLOW_HOME)/../tools/install/OpenROAD/bin/openroad)
 endif
-ifneq (${IN_NIX_SHELL}, "")
-  export OPENSTA_EXE := $(shell which opensta)
+ifneq (${IN_NIX_SHELL},)
+  export OPENSTA_EXE := $(shell command -v sta)
 else
-  export OPENSTA_EXE ?= $(abspath $(FLOW_HOME)/../tools/install/OpenROAD/bin/opensta)
+  export OPENSTA_EXE ?= $(abspath $(FLOW_HOME)/../tools/install/OpenROAD/bin/sta)
 endif
 
 OPENROAD_ARGS            = -no_init -threads $(NUM_CORES) $(OR_ARGS)
 OPENROAD_CMD             = $(OPENROAD_EXE) -exit $(OPENROAD_ARGS)
 OPENROAD_NO_EXIT_CMD     = $(OPENROAD_EXE) $(OPENROAD_ARGS)
 OPENROAD_GUI_CMD         = $(OPENROAD_EXE) -gui $(OR_ARGS)
 
-ifneq (${IN_NIX_SHELL}, "")
-  YOSYS_EXE := $(shell which yosys)
+ifneq (${IN_NIX_SHELL},)
+  YOSYS_EXE := $(shell command -v yosys)
 else
   YOSYS_EXE ?= $(abspath $(FLOW_HOME)/../tools/install/yosys/bin/yosys)
 endif