summaryrefslogtreecommitdiffstats
path: root/buildtools
diff options
context:
space:
mode:
authorEduard Braun <eduard.braun2@gmx.de>2018-09-09 16:04:39 +0000
committerEduard Braun <eduard.braun2@gmx.de>2018-09-09 16:04:39 +0000
commitc2d29abfdacc07a62f49f9bde7cf9a193033af56 (patch)
treeff821b9d9713bd75b60710ae4ed179dc85c6701c /buildtools
parentCI/AppVeyor: Adjust for submodules (diff)
downloadinkscape-c2d29abfdacc07a62f49f9bde7cf9a193033af56.tar.gz
inkscape-c2d29abfdacc07a62f49f9bde7cf9a193033af56.zip
MSYS2: Use system python2-six to avoid conflict with pip version
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/msys2installdeps.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/buildtools/msys2installdeps.sh b/buildtools/msys2installdeps.sh
index 5328faabe..f4c8346b1 100644
--- a/buildtools/msys2installdeps.sh
+++ b/buildtools/msys2installdeps.sh
@@ -80,7 +80,8 @@ $ARCH-python2 \
$ARCH-python2-pip \
$ARCH-python2-lxml \
$ARCH-python2-numpy \
-$ARCH-python2-pillow
+$ARCH-python2-pillow \
+$ARCH-python2-six
for arch in $(eval echo $ARCH); do
case ${arch} in
mingw-w64-i686)