diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2024-01-24 11:04:06 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2024-01-24 11:04:06 +0000 |
| commit | 8609cc8a437164125fe2888c39f4bf35aa218245 (patch) | |
| tree | ee0d26db84351934b7620f5bb78d45d22dd19531 /pkgs/misc | |
| parent | 19f815760d1785594aa5009043c7708caebffdb9 (diff) | |
m33-linux: fix the build against `gcc-13`
Without the change build fails against `gcc-13` on `master` as
https://hydra.nixos.org/build/246586824:
gcode.h:54:24: error: 'uint8_t' was not declared in this scope
54 | vector<uint8_t> getBinary() const;
| ^~~~~~~
gcode.h:9:1: note: 'uint8_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
8 | #include <vector>
+++ |+#include <cstdint>
9 |
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/drivers/m33-linux/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/misc/drivers/m33-linux/default.nix index 84272898f52ca..188013d0c6444 100644 --- a/pkgs/misc/drivers/m33-linux/default.nix +++ b/pkgs/misc/drivers/m33-linux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation { pname = "M33-Linux"; @@ -11,6 +11,16 @@ stdenv.mkDerivation { sha256 = "1bvbclkyfcv23vxb4s1zssvygklks1nhp4iwi4v90c1fvyz0356f"; }; + patches = [ + # Pull the `gcc-13` build fix pending upstream inclusion: + # https://github.com/donovan6000/M33-Linux/pull/6 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/donovan6000/M33-Linux/commit/272e4488ef05cfd95fcc952becfc0ac982306d0c.patch"; + hash = "sha256-ubdCwXFVljvOCzYrWVJgU6PY1j6Ei6aaclhXaGwZT2w="; + }) + ]; + installPhase = '' install -Dm755 m33-linux $out/bin/m33-linux install -Dm755 90-micro-3d-local.rules $out/lib/udev/rules.d/90-micro-3d-local.rules |