diff --git a/SConstruct b/SConstruct index bee043c545..16c1d8ee73 100644 --- a/SConstruct +++ b/SConstruct @@ -42,9 +42,11 @@ if arch != "larch64": import capnproto import eigen import ffmpeg as ffmpeg_pkg + import ncurses import python3_dev import zeromq - pkgs = [capnproto, eigen, ffmpeg_pkg, zeromq] + import zstd + pkgs = [capnproto, eigen, ffmpeg_pkg, ncurses, zeromq, zstd] py_include = python3_dev.INCLUDE_DIR else: # TODO: remove when AGNOS has our new vendor pkgs diff --git a/pyproject.toml b/pyproject.toml index 3c4b1897a4..f983aca8ae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,6 +30,8 @@ dependencies = [ "eigen @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=eigen", "ffmpeg @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=ffmpeg", "python3-dev @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=python3-dev", + "zstd @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=zstd", + "ncurses @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=ncurses", "zeromq @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=zeromq", "git-lfs @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=git-lfs", diff --git a/tools/setup_dependencies.sh b/tools/setup_dependencies.sh index 368c6f2008..df06d4ab1d 100755 --- a/tools/setup_dependencies.sh +++ b/tools/setup_dependencies.sh @@ -48,10 +48,6 @@ function install_ubuntu_deps() { git \ xvfb - $SUDO apt-get install -y --no-install-recommends \ - libncurses5-dev \ - libzstd-dev - if [[ -d "/etc/udev/rules.d/" ]]; then # Setup jungle udev rules $SUDO tee /etc/udev/rules.d/12-panda_jungle.rules > /dev/null <