Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-01-11 16:06:11 +00:00
commit 1e061c7d59

View File

@ -86,6 +86,6 @@ mkShell {
shellHook = '' shellHook = ''
# Prevent the avr-gcc wrapper from picking up host GCC flags # Prevent the avr-gcc wrapper from picking up host GCC flags
# like -iframework, which is problematic on Darwin # like -iframework, which is problematic on Darwin
unset NIX_TARGET_CFLAGS_COMPILE unset NIX_CFLAGS_COMPILE_FOR_TARGET
''; '';
} }