diff --git a/flake.nix b/flake.nix
index 23d68edf..4676c2e8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -45,13 +45,16 @@
               poetry2nix.defaultPoetryOverrides
             ];
           };
-
-        # This is the final list of dependencies we need to build the project.
-        project_deps =
-          [
+      in {
+        devShells.default = pkgs.mkShell {
+          name = "labenv";
+          buildInputs = with pkgs; [
+            libelf
+            zlib
+          ];
+          nativeBuildInputs = with pkgs; [
             pythonEnv
-          ]
-          ++ (with pkgs; [
+
             cmake
             openocd
             screen
@@ -70,17 +73,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