diff options
| author | Delan Azabani <dazabani@igalia.com> | 2025-03-28 17:43:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-28 09:43:03 +0000 |
| commit | 4814e7f7428bc858d63bc7140e8e9ca7e00b6cf5 (patch) | |
| tree | 9b9351719e085674511ffb88fb8d81e9ca056f35 | |
| parent | a2b46cf6e63bc1340b0ba79bf35f97cf913e6b9a (diff) | |
| download | servo-4814e7f7428bc858d63bc7140e8e9ca7e00b6cf5.tar.gz servo-4814e7f7428bc858d63bc7140e8e9ca7e00b6cf5.zip | |
Install tshark for automated tests in #36033 (#36201)
Signed-off-by: Delan Azabani <dazabani@igalia.com>
| -rw-r--r-- | python/servo/platform/linux.py | 15 | ||||
| -rw-r--r-- | shell.nix | 1 |
2 files changed, 9 insertions, 7 deletions
diff --git a/python/servo/platform/linux.py b/python/servo/platform/linux.py index c6bf1be5b92..411a8fc1578 100644 --- a/python/servo/platform/linux.py +++ b/python/servo/platform/linux.py @@ -15,15 +15,15 @@ from typing import Optional, Tuple from .base import Base from .build_target import BuildTarget -# Please keep these in sync with the packages on the wiki, using the instructions below -# https://github.com/servo/servo/wiki/Building +# Please keep these in sync with the packages in the book, using the instructions below +# https://book.servo.org/hacking/setting-up-your-environment.html # https://packages.debian.org # https://packages.ubuntu.com # 1. open devtools # 2. paste in the whole APT_PKGS = [...] # 3. copy(`sudo apt install ${APT_PKGS.join(" ")}`) -# 4. paste into https://github.com/servo/servo/wiki/Building#debian-based-distributions +# 4. paste into https://github.com/servo/book/edit/main/src/hacking/setting-up-your-environment.md APT_PKGS = [ 'build-essential', 'ccache', 'clang', 'cmake', 'curl', 'g++', 'git', 'gperf', 'libdbus-1-dev', 'libfreetype6-dev', 'libgl1-mesa-dri', @@ -39,14 +39,15 @@ APT_PKGS = [ 'libharfbuzz-dev', 'liblzma-dev', 'libudev-dev', 'libunwind-dev', 'libvulkan1', 'libx11-dev', 'libxcb-render0-dev', 'libxcb-shape0-dev', 'libxcb-xfixes0-dev', 'libxmu-dev', 'libxmu6', 'libegl1-mesa-dev', - 'llvm-dev', 'm4', 'xorg-dev', 'libxkbcommon0', "libxkbcommon-x11-0" + 'llvm-dev', 'm4', 'xorg-dev', 'libxkbcommon0', "libxkbcommon-x11-0", + 'tshark', ] # https://packages.fedoraproject.org # 1. open devtools # 2. paste in the whole DNF_PKGS = [...] # 3. copy(`sudo dnf install ${DNF_PKGS.join(" ")}`) -# 4. paste into https://github.com/servo/servo/wiki/Building#fedora +# 4. paste into https://github.com/servo/book/edit/main/src/hacking/setting-up-your-environment.md DNF_PKGS = ['libtool', 'gcc-c++', 'libXi-devel', 'freetype-devel', 'libunwind-devel', 'mesa-libGL-devel', 'mesa-libEGL-devel', 'glib2-devel', 'libX11-devel', 'libXrandr-devel', 'gperf', @@ -58,13 +59,13 @@ DNF_PKGS = ['libtool', 'gcc-c++', 'libXi-devel', 'freetype-devel', 'gstreamer1-plugins-good', 'gstreamer1-plugins-bad-free-devel', 'gstreamer1-plugins-ugly-free', 'libjpeg-turbo-devel', 'zlib-ng', 'libjpeg-turbo', 'vulkan-loader', 'libxkbcommon', - 'libxkbcommon-x11'] + 'libxkbcommon-x11', 'wireshark-cli'] # https://voidlinux.org/packages/ # 1. open devtools # 2. paste in the whole XBPS_PKGS = [...] # 3. copy(`sudo xbps-install ${XBPS_PKGS.join(" ")}`) -# 4. paste into https://github.com/servo/servo/wiki/Building#void-linux +# 4. paste into https://github.com/servo/book/edit/main/src/hacking/setting-up-your-environment.md XBPS_PKGS = ['libtool', 'gcc', 'libXi-devel', 'freetype-devel', 'libunwind-devel', 'MesaLib-devel', 'glib-devel', 'pkg-config', 'libX11-devel', 'libXrandr-devel', 'gperf', 'bzip2-devel', diff --git a/shell.nix b/shell.nix index bec1eb3c621..74a5dd4511b 100644 --- a/shell.nix +++ b/shell.nix @@ -81,6 +81,7 @@ stdenv.mkDerivation (androidEnvironment // { llvmPackages.bintools # provides lld udev # Needed by libudev-sys for GamePad API. + wireshark-cli # for `tshark` in etc/devtools_parser.py # Build utilities cmake dbus gcc git pkg-config which llvm perl yasm m4 |