mg/qmk_sweep_skeletyl
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow overriding Niv inputs in shell.nix (#16602)

Browse source
This commit is contained in:
Astrid Yu 2022-05-11 23:49:15 -07:00 committed by GitHub
parent 8a4ef2b3c4
commit c0ab4ed539
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
shell.nix
View file

@ -1,10 +1,26 @@
{ avr ? true, arm ? true, teensy ? true }:
let let
# We specify sources via Niv: use "niv update nixpkgs" to update nixpkgs, for example. # We specify sources via Niv: use "niv update nixpkgs" to update nixpkgs, for example.
sources = import ./util/nix/sources.nix { }; sources = import ./util/nix/sources.nix { };
pkgs = import sources.nixpkgs { }; in
# However, if you want to override Niv's inputs, this will let you do that.
{ pkgs ? import sources.nixpkgs { }
, poetry2nix ? pkgs.callPackage (import sources.poetry2nix) { }
, avr ? true
, arm ? true
, teensy ? true }:
with pkgs;
let
avrlibc = pkgsCross.avr.libcCross;
poetry2nix = pkgs.callPackage (import sources.poetry2nix) { }; avr_incflags = [
"-isystem ${avrlibc}/avr/include"
"-B${avrlibc}/avr/lib/avr5"
"-L${avrlibc}/avr/lib/avr5"
"-B${avrlibc}/avr/lib/avr35"
"-L${avrlibc}/avr/lib/avr35"
"-B${avrlibc}/avr/lib/avr51"
"-L${avrlibc}/avr/lib/avr51"
];
# Builds the python env based on nix/pyproject.toml and # Builds the python env based on nix/pyproject.toml and
# nix/poetry.lock Use the "poetry update --lock", "poetry add # nix/poetry.lock Use the "poetry update --lock", "poetry add
@ -21,21 +37,6 @@ let
}); });
}; };
in in
with pkgs;
let
avrlibc = pkgsCross.avr.libcCross;
avr_incflags = [
"-isystem ${avrlibc}/avr/include"
"-B${avrlibc}/avr/lib/avr5"
"-L${avrlibc}/avr/lib/avr5"
"-B${avrlibc}/avr/lib/avr35"
"-L${avrlibc}/avr/lib/avr35"
"-B${avrlibc}/avr/lib/avr51"
"-L${avrlibc}/avr/lib/avr51"
];
in
mkShell { mkShell {
name = "qmk-firmware"; name = "qmk-firmware";