X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=shell.nix;h=df5aff3508fe8a2458dcca2a68845e33d2b50117;hb=f48986dda29f9ca4a88d4b4da9ba00dd7864914e;hp=6ff8a7ad2d8fdeba8aea714cd2d125a1d8d776cb;hpb=2bb2977c133646c4e056960e72029270d77cc1eb;p=qmk_firmware.git

diff --git a/shell.nix b/shell.nix
index 6ff8a7ad2..df5aff350 100644
--- a/shell.nix
+++ b/shell.nix
@@ -6,7 +6,10 @@ with pkgs;
 let
   avrbinutils = pkgsCross.avr.buildPackages.binutils;
   avrlibc = pkgsCross.avr.libcCross;
-  gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
+  gcc-arm-embedded = (import (builtins.fetchTarball {
+    url = "https://github.com/NixOS/nixpkgs-channels/archive/87f146a41c463a64c93022b11cf19716b3a22037.tar.gz";
+    sha256 = "0rk8haf19plw6vyvq0am99rik0hrrysknjw0f2vs7985awngy3q2";
+  }) {}).gcc-arm-embedded;
 
   avr_incflags = [
     "-isystem ${avrlibc}/avr/include"
@@ -29,7 +32,7 @@ in
 stdenv.mkDerivation {
   name = "qmk-firmware";
 
-  buildInputs = [ dfu-programmer dfu-util diffutils git ]
+  buildInputs = [ dfu-programmer dfu-util diffutils git python3 ]
     ++ lib.optional avr [ avrbinutils avrgcc avrlibc avrdude ]
     ++ lib.optional arm [ gcc-arm-embedded ]
     ++ lib.optional teensy [ teensy-loader-cli ];