Azahar-Mirror/build-environment
1
0
Fork 0
mirror of https://github.com/azahar-emu/build-environment synced 2025-11-07 07:30:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjust dependencies for CI service (#4)

Browse Source 
* linux-frozen: remove qt5-tools

This reverts commit 6ce52747cdb3204fb22659694a4cb1b77eeb2818.
Since freezing this package is not possible

* linux-fresh and mingw: add p7zip
This commit is contained in:
liushuyu 2018-06-16 16:23:40 -06:00 committed by Flame Sage
parent 5569ee3eb3
commit f21f7d5927
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux-fresh/Dockerfile
View File

@ -2,4 +2,4 @@ FROM ubuntu:18.04
MAINTAINER citra MAINTAINER citra
RUN useradd -m -s /bin/bash citra RUN useradd -m -s /bin/bash citra
RUN apt-get update && apt-get -y full-upgrade RUN apt-get update && apt-get -y full-upgrade
RUN apt-get install -y build-essential libsdl2-dev qtbase5-dev libqt5opengl5-dev qtmultimedia5-dev qttools5-dev qttools5-dev-tools wget git ccache cmake RUN apt-get install -y p7zip-full build-essential libsdl2-dev qtbase5-dev libqt5opengl5-dev qtmultimedia5-dev qttools5-dev qttools5-dev-tools wget git ccache cmake

1
linux-frozen/Dockerfile
View File

@ -6,7 +6,6 @@ RUN apt-get update && apt-get install -y build-essential wget git python-launchp
RUN cd /tmp/pkgs && python2 install_package.py \ RUN cd /tmp/pkgs && python2 install_package.py \
libsdl2-dev 2.0.7+dfsg1-3ubuntu1 bionic \ libsdl2-dev 2.0.7+dfsg1-3ubuntu1 bionic \
qtbase5-dev 5.9.3+dfsg-0ubuntu2 bionic \ qtbase5-dev 5.9.3+dfsg-0ubuntu2 bionic \
qttools5-dev-tools 5.9.5-0ubuntu1 bionic \
libqt5opengl5-dev 5.9.3+dfsg-0ubuntu2 bionic \ libqt5opengl5-dev 5.9.3+dfsg-0ubuntu2 bionic \
qt5-qmltooling-plugins 5.9.3-0ubuntu1 bionic \ qt5-qmltooling-plugins 5.9.3-0ubuntu1 bionic \
qtdeclarative5-dev 5.9.3-0ubuntu1 bionic \ qtdeclarative5-dev 5.9.3-0ubuntu1 bionic \

2
linux-mingw/Dockerfile
View File

@ -1,7 +1,7 @@
FROM ubuntu:18.04 FROM ubuntu:18.04
MAINTAINER citra MAINTAINER citra
RUN useradd -m -s /bin/bash citra RUN useradd -m -s /bin/bash citra
RUN apt-get update && apt-get install -y gpg wget git python3-pip ccache g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 mingw-w64-tools cmake RUN apt-get update && apt-get install -y gpg wget git python3-pip ccache p7zip-full g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 mingw-w64-tools cmake
# workaround broken headers in Ubuntu MinGW package # workaround broken headers in Ubuntu MinGW package
COPY errno.h /usr/x86_64-w64-mingw32/include/ COPY errno.h /usr/x86_64-w64-mingw32/include/
# HACK: the repository does not contain necessary packages for 18.04, we'll use packages for 17.10 for now # HACK: the repository does not contain necessary packages for 18.04, we'll use packages for 17.10 for now