summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-05-12 06:49:59 +0000
committerQMK Bot <hello@qmk.fm>2022-05-12 06:49:59 +0000
commita8183340d0986ed2080de906bc29725f05d9183d (patch)
tree4d683c3e814670e86cc18c3a1bad4920555c3808
parentec7801e2cbfaae5208a147e85157f82ceb0f1dbe (diff)
parentc0ab4ed539bad0a490e19ee86c093d3c3f5e02c2 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--shell.nix37
1 files changed, 19 insertions, 18 deletions
diff --git a/shell.nix b/shell.nix
index 5023a3b0f7..4701c83bb6 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,10 +1,26 @@
-{ avr ? true, arm ? true, teensy ? true }:
let
# We specify sources via Niv: use "niv update nixpkgs" to update nixpkgs, for example.
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
# nix/poetry.lock Use the "poetry update --lock", "poetry add
@@ -21,21 +37,6 @@ let
});
};
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 {
name = "qmk-firmware";