X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=shell.nix;h=e85221975d3182d20662dc9ba09886b9bf738306;hb=d686c0ea43d6a9db7768da64ee54c3ba25c018f7;hp=67efb46b74588d1edda5d8872fa550ff31a991fe;hpb=2b23072c3438ea2a8a8477f738d24be2bc9aacdc;p=qmk_firmware.git

diff --git a/shell.nix b/shell.nix
index 67efb46b7..e85221975 100644
--- a/shell.nix
+++ b/shell.nix
@@ -4,6 +4,13 @@
 
 with pkgs;
 let
+  avrbinutils = pkgsCross.avr.buildPackages.binutils;
+  avrlibc = pkgsCross.avr.libcCross;
+  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"
     "-B${avrlibc}/avr/lib/avr5"
@@ -13,7 +20,7 @@ let
     "-B${avrlibc}/avr/lib/avr51"
     "-L${avrlibc}/avr/lib/avr51"
   ];
-  avrgcc = pkgs.avrgcc.overrideAttrs (oldAttrs: rec {
+  avrgcc = pkgsCross.avr.buildPackages.gcc.overrideAttrs (oldAttrs: rec {
     name = "avr-gcc-8.1.0";
     src = fetchurl {
       url = "mirror://gcc/releases/gcc-8.1.0/gcc-8.1.0.tar.xz";