aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorJack Henahan <jhenahan@me.com>2018-09-25 18:16:35 -0400
committerskullydazed <skullydazed@users.noreply.github.com>2018-09-25 15:16:35 -0700
commit2b23072c3438ea2a8a8477f738d24be2bc9aacdc (patch)
treebffde22ed40aa494ce385b62ef09f1de1cef2f09 /util
parent9dc19fdb6d0fedfb0080891a8eff49a8fc3b70c2 (diff)
downloadqmk_firmware-2b23072c3438ea2a8a8477f738d24be2bc9aacdc.tar.gz
qmk_firmware-2b23072c3438ea2a8a8477f738d24be2bc9aacdc.zip
Pin avr-gcc in shell.nix pending release of 8.3.0 (#3922)
* Pin avr-gcc in shell.nix pending release of 8.3.0 There's apparently a critical bug in 8.2.0, which is now the nixpkgs default. This change overrides that default in favor of the known good version. Once 8.3.0 is the default, the override can be dropped. * Arch/Manjaro fix
Diffstat (limited to 'util')
-rwxr-xr-xutil/linux_install.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/util/linux_install.sh b/util/linux_install.sh
index d5da59e82..9b8b92d08 100755
--- a/util/linux_install.sh
+++ b/util/linux_install.sh
@@ -10,7 +10,9 @@ elif grep ID /etc/os-release | grep -q debian; then
10 dfu-programmer dfu-util gcc-arm-none-eabi binutils-arm-none-eabi \ 10 dfu-programmer dfu-util gcc-arm-none-eabi binutils-arm-none-eabi \
11 libnewlib-arm-none-eabi 11 libnewlib-arm-none-eabi
12elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then 12elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then
13 sudo pacman -S gcc unzip wget zip avr-gcc avr-binutils avr-libc \ 13 # install avr-gcc 8.1 until 8.3 is available. See #3657 for details of the bug.
14 sudo pacman -U https://archive.archlinux.org/packages/a/avr-gcc/avr-gcc-8.1.0-1-x86_64.pkg.tar.xz
15 sudo pacman -S gcc unzip wget zip avr-binutils avr-libc \
14 dfu-util arm-none-eabi-gcc arm-none-eabi-binutils \ 16 dfu-util arm-none-eabi-gcc arm-none-eabi-binutils \
15 arm-none-eabi-newlib 17 arm-none-eabi-newlib
16 git clone https://aur.archlinux.org/dfu-programmer.git /tmp/dfu-programmer 18 git clone https://aur.archlinux.org/dfu-programmer.git /tmp/dfu-programmer