update shell.nix (#8910)
* now uses gcc 8.4 * fixes building boards with adafruit feather (in my case pancake)
This commit is contained in:
parent
02781979d6
commit
e58ab6d326
1 changed files with 12 additions and 12 deletions
24
shell.nix
24
shell.nix
|
@ -8,26 +8,21 @@ let
|
||||||
in {
|
in {
|
||||||
dfu-programmer = addDarwinSupport super.dfu-programmer;
|
dfu-programmer = addDarwinSupport super.dfu-programmer;
|
||||||
teensy-loader-cli = addDarwinSupport super.teensy-loader-cli;
|
teensy-loader-cli = addDarwinSupport super.teensy-loader-cli;
|
||||||
|
|
||||||
avrgcc = super.avrgcc.overrideAttrs (oldAttrs: rec {
|
|
||||||
name = "avr-gcc-8.1.0";
|
|
||||||
src = super.fetchurl {
|
|
||||||
url = "mirror://gcc/releases/gcc-8.1.0/gcc-8.1.0.tar.xz";
|
|
||||||
sha256 = "0lxil8x0jjx7zbf90cy1rli650akaa6hpk8wk8s62vk2jbwnc60x";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nixpkgs = builtins.fetchTarball {
|
nixpkgs = builtins.fetchTarball {
|
||||||
url = "https://github.com/NixOS/nixpkgs/archive/0260747427737b980f0.tar.gz";
|
url = "https://github.com/NixOS/nixpkgs/archive/903266491b7b9b0379e88709feca0af900def0d9.tar.gz";
|
||||||
sha256 = "1p2yc6b40xvvxvmlqd9wb440pkrimnlc2wsbpa5rddlpx1dn8qmf";
|
sha256 = "1b5wjrfgyha6s15k1yjyx41hvrpmd5szpkpkxk6l5hyrfqsr8wip";
|
||||||
};
|
};
|
||||||
|
|
||||||
pkgs = import nixpkgs { overlays = [ overlay ]; };
|
pkgs = import nixpkgs { overlays = [ overlay ]; };
|
||||||
in
|
in
|
||||||
|
|
||||||
with pkgs;
|
with pkgs;
|
||||||
let avr_incflags = [
|
let
|
||||||
|
avrlibc = pkgsCross.avr.libcCross;
|
||||||
|
|
||||||
|
avr_incflags = [
|
||||||
"-isystem ${avrlibc}/avr/include"
|
"-isystem ${avrlibc}/avr/include"
|
||||||
"-B${avrlibc}/avr/lib/avr5"
|
"-B${avrlibc}/avr/lib/avr5"
|
||||||
"-L${avrlibc}/avr/lib/avr5"
|
"-L${avrlibc}/avr/lib/avr5"
|
||||||
|
@ -41,7 +36,12 @@ stdenv.mkDerivation {
|
||||||
name = "qmk-firmware";
|
name = "qmk-firmware";
|
||||||
|
|
||||||
buildInputs = [ dfu-programmer dfu-util diffutils git python3 ]
|
buildInputs = [ dfu-programmer dfu-util diffutils git python3 ]
|
||||||
++ lib.optional avr [ avrbinutils avrgcc avrlibc avrdude ]
|
++ lib.optional avr [
|
||||||
|
pkgsCross.avr.buildPackages.binutils
|
||||||
|
pkgsCross.avr.buildPackages.gcc8
|
||||||
|
avrlibc
|
||||||
|
avrdude
|
||||||
|
]
|
||||||
++ lib.optional arm [ gcc-arm-embedded ]
|
++ lib.optional arm [ gcc-arm-embedded ]
|
||||||
++ lib.optional teensy [ teensy-loader-cli ];
|
++ lib.optional teensy [ teensy-loader-cli ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue