diff options
| author | Luka Zitnik <luka.zitnik@gmail.com> | 2020-02-14 00:45:18 +0100 |
|---|---|---|
| committer | Luka Zitnik <luka.zitnik@gmail.com> | 2020-02-14 03:09:38 +0100 |
| commit | a15775bad72a28f967854b15390c8e983d6e7c12 (patch) | |
| tree | 5fedcef4fbe46b649711d374394fec7835f14651 /python/servo/bootstrap.py | |
| parent | e697e6cca70bec57b5ed9512b95c2a72359d6ca1 (diff) | |
| download | servo-a15775bad72a28f967854b15390c8e983d6e7c12.tar.gz servo-a15775bad72a28f967854b15390c8e983d6e7c12.zip | |
Instruct intallation of python-vitualenv
Fixes servo/servo#23210
Closes servo/servo#23212
Diffstat (limited to 'python/servo/bootstrap.py')
| -rw-r--r-- | python/servo/bootstrap.py | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/python/servo/bootstrap.py b/python/servo/bootstrap.py index 4b2f4fc9ec3..ae3574dd41b 100644 --- a/python/servo/bootstrap.py +++ b/python/servo/bootstrap.py @@ -113,26 +113,24 @@ def linux(context, force=False): # Please keep these in sync with the packages in README.md pkgs_apt = ['git', 'curl', 'autoconf', 'libx11-dev', 'libfreetype6-dev', 'libgl1-mesa-dri', 'libglib2.0-dev', 'xorg-dev', 'gperf', 'g++', - 'build-essential', 'cmake', 'python-pip', "libssl-dev", - 'libbz2-dev', 'liblzma-dev', - 'libosmesa6-dev', 'libxmu6', 'libxmu-dev', 'libglu1-mesa-dev', - 'libgles2-mesa-dev', 'libegl1-mesa-dev', 'libdbus-1-dev', 'libharfbuzz-dev', - 'ccache', 'clang', 'autoconf2.13', 'libunwind-dev', 'llvm-dev'] - pkgs_dnf = ['libtool', 'gcc-c++', 'libXi-devel', 'freetype-devel', 'libunwind-devel', - 'mesa-libGL-devel', 'mesa-libEGL-devel', 'glib2-devel', 'libX11-devel', - 'libXrandr-devel', 'gperf', 'fontconfig-devel', 'cabextract', 'ttmkfdir', - 'python2', 'python2-virtualenv', 'python2-pip', 'expat-devel', 'rpm-build', - 'openssl-devel', 'cmake', 'bzip2-devel', 'libXcursor-devel', 'libXmu-devel', - 'mesa-libOSMesa-devel', 'dbus-devel', 'ncurses-devel', 'harfbuzz-devel', - 'ccache', 'mesa-libGLU-devel', 'clang', 'clang-libs', 'gstreamer1-devel', - 'gstreamer1-plugins-base-devel', 'gstreamer1-plugins-bad-free-devel', 'autoconf213'] - if context.distro == "Ubuntu": - if context.distro_version == "14.04": - pkgs_apt += ["python-virtualenv"] - else: - pkgs_apt += ["virtualenv"] - pkgs_apt += ['libgstreamer1.0-dev', 'libgstreamer-plugins-base1.0-dev', - 'libgstreamer-plugins-bad1.0-dev'] + 'build-essential', 'cmake', "libssl-dev", 'libbz2-dev', + 'liblzma-dev', 'libosmesa6-dev', 'libxmu6', 'libxmu-dev', + 'libglu1-mesa-dev', 'libgles2-mesa-dev', 'libegl1-mesa-dev', + 'libdbus-1-dev', 'libharfbuzz-dev', 'ccache', 'clang', + 'autoconf2.13', 'libunwind-dev', 'llvm-dev'] + pkgs_dnf = ['libtool', 'gcc-c++', 'libXi-devel', 'freetype-devel', + 'libunwind-devel', 'mesa-libGL-devel', 'mesa-libEGL-devel', + 'glib2-devel', 'libX11-devel', 'libXrandr-devel', 'gperf', + 'fontconfig-devel', 'cabextract', 'ttmkfdir', 'expat-devel', + 'rpm-build', 'openssl-devel', 'cmake', 'bzip2-devel', + 'libXcursor-devel', 'libXmu-devel', 'mesa-libOSMesa-devel', + 'dbus-devel', 'ncurses-devel', 'harfbuzz-devel', 'ccache', + 'mesa-libGLU-devel', 'clang', 'clang-libs', 'gstreamer1-devel', + 'gstreamer1-plugins-base-devel', + 'gstreamer1-plugins-bad-free-devel', 'autoconf213'] + if context.distro == "Ubuntu" and context.distro_version != "14.04": + pkgs_apt += ['libgstreamer1.0-dev', 'libgstreamer-plugins-base1.0-dev', + 'libgstreamer-plugins-bad1.0-dev'] installed_something = install_linux_deps(context, pkgs_apt, pkgs_dnf, force) |