From 5e52eda0cacd45d2daa63dce71d7b7ceb5953368 Mon Sep 17 00:00:00 2001
From: Michishige Kaito <me@mkaito.com>
Date: Thu, 20 Dec 2018 22:55:13 +0000
Subject: [PATCH] shell.nix: Packages relocated in upstream cleanup

---
 shell.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/shell.nix b/shell.nix
index 67efb46b7..6ff8a7ad2 100644
--- a/shell.nix
+++ b/shell.nix
@@ -4,6 +4,10 @@
 
 with pkgs;
 let
+  avrbinutils = pkgsCross.avr.buildPackages.binutils;
+  avrlibc = pkgsCross.avr.libcCross;
+  gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
+
   avr_incflags = [
     "-isystem ${avrlibc}/avr/include"
     "-B${avrlibc}/avr/lib/avr5"
@@ -13,7 +17,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";