Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nix update and cleanups #83

Merged
merged 6 commits into from
Jan 4, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Separate buildInputs and nativeBuildInputs
  • Loading branch information
nbdd0121 committed Jan 4, 2024
commit e5191f7f7940bbd33f6e92090d601f0fdc2fdb78
28 changes: 15 additions & 13 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -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