diff options
author | QMK Bot <hello@qmk.fm> | 2021-01-11 16:06:11 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-01-11 16:06:11 +0000 |
commit | 1e061c7d590166cd778f36c108dda0bcc0596135 (patch) | |
tree | 329c2e7360eda84b8e98f6ed35df8a4df1a0a0ca | |
parent | 4244c306a884ff62a122fef7ff927f05140169b9 (diff) | |
parent | e941f048919bba052fd326eadc5acd2347e6756e (diff) |
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r-- | shell.nix | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -86,6 +86,6 @@ mkShell { shellHook = '' # Prevent the avr-gcc wrapper from picking up host GCC flags # like -iframework, which is problematic on Darwin - unset NIX_TARGET_CFLAGS_COMPILE + unset NIX_CFLAGS_COMPILE_FOR_TARGET ''; } |