Merge pull request #202960 from dotlambda/klipper-python3

This commit is contained in:
Martin Weinelt 2022-11-26 13:11:58 +01:00 committed by GitHub
commit 6f8b75aa78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions

View file

@ -6,7 +6,6 @@
, libffi , libffi
, libusb1 , libusb1
, wxGTK30-gtk3 , wxGTK30-gtk3
, python2
, python3 , python3
, gcc-arm-embedded , gcc-arm-embedded
, klipper , klipper
@ -20,7 +19,6 @@
src = klipper.src; src = klipper.src;
nativeBuildInputs = [ nativeBuildInputs = [
python2
python3 python3
pkgsCross.avr.stdenv.cc pkgsCross.avr.stdenv.cc
gcc-arm-embedded gcc-arm-embedded

View file

@ -4,7 +4,7 @@
, pkgsCross , pkgsCross
, klipper , klipper
, klipper-firmware , klipper-firmware
, python2 , python3
, avrdude , avrdude
, stm32flash , stm32flash
, mcu ? "mcu" , mcu ? "mcu"
@ -19,7 +19,7 @@ in
writeShellApplication { writeShellApplication {
name = "klipper-flash-${mcu}"; name = "klipper-flash-${mcu}";
runtimeInputs = [ runtimeInputs = [
python2 python3
pkgsCross.avr.stdenv.cc pkgsCross.avr.stdenv.cc
gnumake gnumake
] ++ lib.optionals (boardArch == "avr") [ avrdude ] ++ lib.optionals (boardArch == "stm32") [ stm32flash ]; ] ++ lib.optionals (boardArch == "avr") [ avrdude ] ++ lib.optionals (boardArch == "stm32") [ stm32flash ];

View file

@ -1,12 +1,12 @@
{ writeShellApplication { writeShellApplication
, klipper , klipper
, python2 , python3
, gnumake , gnumake
, pkgsCross , pkgsCross
}: writeShellApplication { }: writeShellApplication {
name = "klipper-genconf"; name = "klipper-genconf";
runtimeInputs = [ runtimeInputs = [
python2 python3
pkgsCross.avr.stdenv.cc pkgsCross.avr.stdenv.cc
gnumake gnumake
]; ];