summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCabia Rangris <cab@cab.moe>2024-05-09 22:27:29 +0400
committerCabia Rangris <cab@cab.moe>2024-05-09 22:27:29 +0400
commita3764ad9212011fa0e2be76a88146b122fd5d985 (patch)
tree94ab4d4609f1fbc6e7e24efd4143754bb7a31c0e
parentMerge pull request #293912 from r-ryantm/auto-update/libmcfp (diff)
downloadnixpkgs-origin/klipper-fw-fix.tar.gz
klipper-firmware: build fixorigin/klipper-fw-fix
- updated firmware buildconf - updated gcc version
-rw-r--r--pkgs/servers/klipper/simulator.cfg1
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/servers/klipper/simulator.cfg b/pkgs/servers/klipper/simulator.cfg
index 6a4122ce3aa5..11e8d77b03c3 100644
--- a/pkgs/servers/klipper/simulator.cfg
+++ b/pkgs/servers/klipper/simulator.cfg
@@ -23,6 +23,7 @@ CONFIG_WANT_DISPLAYS=y
CONFIG_WANT_SENSORS=y
CONFIG_WANT_LIS2DW=y
CONFIG_WANT_SOFTWARE_SPI=y
+CONFIG_NEED_SENSOR_BULK=y
CONFIG_CANBUS_FREQUENCY=1000000
CONFIG_HAVE_GPIO=y
CONFIG_HAVE_GPIO_ADC=y
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c2347acf796f..8f2fefff2bb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5673,7 +5673,7 @@ with pkgs;
klipper = callPackage ../servers/klipper { };
- klipper-firmware = callPackage ../servers/klipper/klipper-firmware.nix { gcc-arm-embedded = gcc-arm-embedded-11; };
+ klipper-firmware = callPackage ../servers/klipper/klipper-firmware.nix { gcc-arm-embedded = gcc-arm-embedded-13; };
klipper-flash = callPackage ../servers/klipper/klipper-flash.nix { };