]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
shell.nix: Packages relocated in upstream cleanup
authorMichishige Kaito <me@mkaito.com>
Thu, 20 Dec 2018 22:55:13 +0000 (22:55 +0000)
committerskullydazed <skullydazed@users.noreply.github.com>
Sat, 22 Dec 2018 23:09:58 +0000 (15:09 -0800)
shell.nix

index 67efb46b74588d1edda5d8872fa550ff31a991fe..6ff8a7ad2d8fdeba8aea714cd2d125a1d8d776cb 100644 (file)
--- 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";