summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichishige Kaito <me@mkaito.com>2018-12-20 23:55:13 +0100
committerskullydazed <skullydazed@users.noreply.github.com>2018-12-23 00:09:58 +0100
commit5e52eda0cacd45d2daa63dce71d7b7ceb5953368 (patch)
tree68644ad4fbbdc65997dbe72d8ab2674f6c76679d
parent7bbd299fbac2cc1318ce5ec8cef18ffcf7fe8837 (diff)
downloadqmk_firmware-5e52eda0cacd45d2daa63dce71d7b7ceb5953368.tar.gz
qmk_firmware-5e52eda0cacd45d2daa63dce71d7b7ceb5953368.tar.xz
shell.nix: Packages relocated in upstream cleanup
-rw-r--r--shell.nix6
1 files changed, 5 insertions, 1 deletions
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";