forked from mirrors/nixpkgs
Merge pull request #202960 from dotlambda/klipper-python3
This commit is contained in:
commit
6f8b75aa78
|
@ -6,7 +6,6 @@
|
|||
, libffi
|
||||
, libusb1
|
||||
, wxGTK30-gtk3
|
||||
, python2
|
||||
, python3
|
||||
, gcc-arm-embedded
|
||||
, klipper
|
||||
|
@ -20,7 +19,6 @@
|
|||
src = klipper.src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
python2
|
||||
python3
|
||||
pkgsCross.avr.stdenv.cc
|
||||
gcc-arm-embedded
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
, pkgsCross
|
||||
, klipper
|
||||
, klipper-firmware
|
||||
, python2
|
||||
, python3
|
||||
, avrdude
|
||||
, stm32flash
|
||||
, mcu ? "mcu"
|
||||
|
@ -19,7 +19,7 @@ in
|
|||
writeShellApplication {
|
||||
name = "klipper-flash-${mcu}";
|
||||
runtimeInputs = [
|
||||
python2
|
||||
python3
|
||||
pkgsCross.avr.stdenv.cc
|
||||
gnumake
|
||||
] ++ lib.optionals (boardArch == "avr") [ avrdude ] ++ lib.optionals (boardArch == "stm32") [ stm32flash ];
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ writeShellApplication
|
||||
, klipper
|
||||
, python2
|
||||
, python3
|
||||
, gnumake
|
||||
, pkgsCross
|
||||
}: writeShellApplication {
|
||||
name = "klipper-genconf";
|
||||
runtimeInputs = [
|
||||
python2
|
||||
python3
|
||||
pkgsCross.avr.stdenv.cc
|
||||
gnumake
|
||||
];
|
||||
|
|
Loading…
Reference in a new issue