summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-07-02 14:10:26 +0000
committerQMK Bot <hello@qmk.fm>2022-07-02 14:10:26 +0000
commit11299b337b858c8312d16b93565a2fd18410786f (patch)
treee6c2a0c861a0530bfeffdcb79dc7a9ae88c80213 /util
parentf083eb1a37591896abf7980b10066bd3a309102b (diff)
parentd694488e2e39e9b599775a49fd711acc768e3915 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'util')
-rwxr-xr-xutil/install/msys2.sh13
1 files changed, 5 insertions, 8 deletions
diff --git a/util/install/msys2.sh b/util/install/msys2.sh
index c57c455eb4..fa422023ab 100755
--- a/util/install/msys2.sh
+++ b/util/install/msys2.sh
@@ -7,17 +7,14 @@ _qmk_install_prepare() {
7_qmk_install() { 7_qmk_install() {
8 echo "Installing dependencies" 8 echo "Installing dependencies"
9 9
10 pacman --needed --noconfirm --disable-download-timeout -S pactoys-git 10 pacman --needed --noconfirm --disable-download-timeout -S pactoys
11 pacboy sync --needed --noconfirm --disable-download-timeout \ 11 pacboy sync --needed --noconfirm --disable-download-timeout \
12 base-devel: toolchain:x clang:x git: unzip: python3-pip:x \ 12 base-devel: toolchain:x clang:x python-qmk:x hidapi:x \
13 avr-binutils:x avr-gcc:x avr-libc:x arm-none-eabi-binutils:x \ 13 avr-binutils:x avr-gcc:x avr-libc:x \
14 arm-none-eabi-gcc:x arm-none-eabi-newlib:x avrdude:x bootloadhid:x \ 14 arm-none-eabi-binutils:x arm-none-eabi-gcc:x arm-none-eabi-newlib:x \
15 dfu-programmer:x dfu-util:x teensy-loader-cli:x hidapi:x \ 15 avrdude:x bootloadhid:x dfu-programmer:x dfu-util:x hid-bootloader-cli:x mdloader:x teensy-loader-cli:x wb32-dfu-updater:x
16 python-appdirs:x python-colorama:x python-jsonschema:x python-pillow:x python-pygments:x
17 16
18 _qmk_install_drivers 17 _qmk_install_drivers
19
20 python3 -m pip install -r "$QMK_FIRMWARE_DIR/requirements.txt"
21} 18}
22 19
23_qmk_install_drivers() { 20_qmk_install_drivers() {