Skip to content

Commit a2a0e7f

Browse files
committed
Separate buildInputs and nativeBuildInputs
1 parent 5578999 commit a2a0e7f

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

flake.nix

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,18 @@
4444
poetry2nix.defaultPoetryOverrides
4545
];
4646
};
47-
48-
# This is the final list of dependencies we need to build the project.
49-
project_deps =
50-
[
47+
in {
48+
devShells.default = pkgs.mkShellNoCC {
49+
name = "labenv";
50+
buildInputs = with pkgs; [
51+
# Needed in DPI code
52+
libelf
53+
# Needed when running verilator with FST support
54+
zlib
55+
];
56+
nativeBuildInputs = with pkgs; [
5157
pythonEnv
52-
]
53-
++ (with pkgs; [
58+
5459
cmake
5560
openocd
5661
screen
@@ -69,17 +74,14 @@
6974
gtkwave
7075
srecord
7176
openfpgaloader
72-
libelf
73-
zlib
7477
# vivado
7578

7679
# Poetry tool not required, add for convience in case update is needed
7780
poetry
78-
]);
79-
in {
80-
devShells.default = pkgs.mkShell {
81-
name = "labenv";
82-
buildInputs = project_deps;
81+
82+
# By default mkShell adds non-interactive bash to PATH
83+
bashInteractive
84+
];
8385
shellHook = ''
8486
# FIXME This works on Ubuntu, may not on other distros. FIXME
8587
export LOCALE_ARCHIVE=/usr/lib/locale/locale-archive

0 commit comments

Comments
 (0)