mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-11 04:10:58 +00:00
627e35b7ac
The `poetry` package from the used Nixpkgs snapshot triggers the regex
compatibility issue in Nix >= 2.10.0 binaries for `x86_64-darwin`:
https://www.github.com/NixOS/nix/issues/4758
Remove the `poetry` package from the Nix shell environment for now
(it is not really required to compile QMK, only to develop the Nix shell
environment itself).
In addition, all `poetry` version earlier than 1.1.14 became effectively
non-functional after a breaking change of the PyPI JSON API:
https://www.github.com/python-poetry/poetry/pull/5973
Updating the `poetry` package is not trivial (just adding it it to
`pyproject.toml` does not work due to dependency version conflicts with
other modules), therefore removing it seems to be the easiest solution
to restore compatibility with new Nix versions while not creating any
major inconvenience for QMK users.
69 lines
2.4 KiB
Nix
69 lines
2.4 KiB
Nix
let
|
|
# We specify sources via Niv: use "niv update nixpkgs" to update nixpkgs, for example.
|
|
sources = import ./util/nix/sources.nix { };
|
|
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;
|
|
|
|
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
|
|
# --lock" etc. in the nix folder to adjust the contents of those
|
|
# files if the requirements*.txt files change
|
|
pythonEnv = poetry2nix.mkPoetryEnv {
|
|
projectDir = ./util/nix;
|
|
overrides = poetry2nix.overrides.withDefaults (self: super: {
|
|
pillow = super.pillow.overridePythonAttrs(old: {
|
|
# Use preConfigure from nixpkgs to fix library detection issues and
|
|
# impurities which can break the build process; this also requires
|
|
# adding propagatedBuildInputs and buildInputs from the same source.
|
|
propagatedBuildInputs = (old.buildInputs or []) ++ pkgs.python3.pkgs.pillow.propagatedBuildInputs;
|
|
buildInputs = (old.buildInputs or []) ++ pkgs.python3.pkgs.pillow.buildInputs;
|
|
preConfigure = (old.preConfigure or "") + pkgs.python3.pkgs.pillow.preConfigure;
|
|
});
|
|
qmk = super.qmk.overridePythonAttrs(old: {
|
|
# Allow QMK CLI to run "qmk" as a subprocess (the wrapper changes
|
|
# $PATH and breaks these invocations).
|
|
dontWrapPythonPrograms = true;
|
|
});
|
|
});
|
|
};
|
|
in
|
|
mkShell {
|
|
name = "qmk-firmware";
|
|
|
|
buildInputs = [ clang-tools dfu-programmer dfu-util diffutils git pythonEnv niv ]
|
|
++ lib.optional avr [
|
|
pkgsCross.avr.buildPackages.binutils
|
|
pkgsCross.avr.buildPackages.gcc8
|
|
avrlibc
|
|
avrdude
|
|
]
|
|
++ lib.optional arm [ gcc-arm-embedded ]
|
|
++ lib.optional teensy [ teensy-loader-cli ];
|
|
|
|
AVR_CFLAGS = lib.optional avr avr_incflags;
|
|
AVR_ASFLAGS = lib.optional avr avr_incflags;
|
|
shellHook = ''
|
|
# Prevent the avr-gcc wrapper from picking up host GCC flags
|
|
# like -iframework, which is problematic on Darwin
|
|
unset NIX_CFLAGS_COMPILE_FOR_TARGET
|
|
'';
|
|
}
|