From 3db01e9f4cba6c2e2dab4dc3b372a4e2e000b084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Tue, 20 Jul 2021 21:15:03 +0200 Subject: [PATCH 1/3] qmk: add all dependencies required for normal operation --- pkgs/tools/misc/qmk/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/qmk/default.nix b/pkgs/tools/misc/qmk/default.nix index 5067e1e0fabe..10ea891a1abb 100644 --- a/pkgs/tools/misc/qmk/default.nix +++ b/pkgs/tools/misc/qmk/default.nix @@ -1,5 +1,10 @@ { lib , python3 +, pkgsCross +, avrdude +, dfu-programmer +, dfu-util +, gcc-arm-embedded }: python3.pkgs.buildPythonApplication rec { @@ -30,6 +35,14 @@ python3.pkgs.buildPythonApplication rec { milc pygments pyusb + ] ++ [ # Binaries need to be in the path so this is in propagatedBuildInputs + avrdude + dfu-programmer + dfu-util + gcc-arm-embedded + pkgsCross.avr.buildPackages.binutils + pkgsCross.avr.buildPackages.gcc8 + pkgsCross.avr.libcCross ]; # buildPythonApplication requires setup.py; the setup.py file crafted below @@ -61,6 +74,6 @@ python3.pkgs.buildPythonApplication rec { - ... and many more! ''; license = licenses.mit; - maintainers = with maintainers; [ bhipple babariviere ]; + maintainers = with maintainers; [ bhipple babariviere ekleog ]; }; } From df720b7b734558052a72ea3546459ebc9c863ff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Thu, 20 Jan 2022 17:53:24 +0100 Subject: [PATCH 2/3] qmk: also add teensy flash tool Co-authored-by: Sergey Vlasov --- pkgs/tools/misc/qmk/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/qmk/default.nix b/pkgs/tools/misc/qmk/default.nix index 10ea891a1abb..a16553e2027d 100644 --- a/pkgs/tools/misc/qmk/default.nix +++ b/pkgs/tools/misc/qmk/default.nix @@ -5,6 +5,7 @@ , dfu-programmer , dfu-util , gcc-arm-embedded +, teensy-loader-cli }: python3.pkgs.buildPythonApplication rec { @@ -39,6 +40,7 @@ python3.pkgs.buildPythonApplication rec { avrdude dfu-programmer dfu-util + teensy-loader-cli gcc-arm-embedded pkgsCross.avr.buildPackages.binutils pkgsCross.avr.buildPackages.gcc8 From b32f827d24373e8c77dabbead366dce215da4e07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Thu, 20 Jan 2022 17:54:32 +0100 Subject: [PATCH 3/3] qmk: make sure AVR-based keyboards can build too Co-authored-by: Sergey Vlasov --- pkgs/tools/misc/qmk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/qmk/default.nix b/pkgs/tools/misc/qmk/default.nix index a16553e2027d..21eb7bdab292 100644 --- a/pkgs/tools/misc/qmk/default.nix +++ b/pkgs/tools/misc/qmk/default.nix @@ -43,6 +43,7 @@ python3.pkgs.buildPythonApplication rec { teensy-loader-cli gcc-arm-embedded pkgsCross.avr.buildPackages.binutils + pkgsCross.avr.buildPackages.binutils.bintools pkgsCross.avr.buildPackages.gcc8 pkgsCross.avr.libcCross ];