From e5191f7f7940bbd33f6e92090d601f0fdc2fdb78 Mon Sep 17 00:00:00 2001
From: Gary Guo <gary.guo@lowrisc.org>
Date: Wed, 3 Jan 2024 11:43:12 +0000
Subject: [PATCH] Separate buildInputs and nativeBuildInputs

---
 flake.nix | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index 1c5e6de0..41ddac53 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,13 +44,18 @@
             poetry2nix.defaultPoetryOverrides
           ];
         };
-
-      # This is the final list of dependencies we need to build the project.
-      project_deps =
-        [
+    in {
+      devShells.default = pkgs.mkShellNoCC {
+        name = "labenv";
+        buildInputs = with pkgs; [
+          # Needed in DPI code
+          libelf
+          # Needed when running verilator with FST support
+          zlib
+        ];
+        nativeBuildInputs = with pkgs; [
           pythonEnv
-        ]
-        ++ (with pkgs; [
+
           cmake
           openocd
           screen
@@ -69,17 +74,14 @@
           gtkwave
           srecord
           openfpgaloader
-          libelf
-          zlib
           # vivado
 
           # Poetry tool not required, add for convience in case update is needed
           poetry
-        ]);
-    in {
-      devShells.default = pkgs.mkShell {
-        name = "labenv";
-        buildInputs = project_deps;
+
+          # By default mkShell adds non-interactive bash to PATH
+          bashInteractive
+        ];
         shellHook = ''
           # FIXME This works on Ubuntu, may not on other distros. FIXME
           export LOCALE_ARCHIVE=/usr/lib/locale/locale-archive