Merge pull request #283475 from trofi/m33-linux-gcc-13-fix

m33-linux: fix the build against `gcc-13`
This commit is contained in:
Nick Cao 2024-01-24 10:18:21 -05:00 committed by GitHub
commit 2f6a29ab05
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub }: { lib, stdenv, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "M33-Linux"; pname = "M33-Linux";
@ -11,6 +11,16 @@ stdenv.mkDerivation {
sha256 = "1bvbclkyfcv23vxb4s1zssvygklks1nhp4iwi4v90c1fvyz0356f"; 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 = '' installPhase = ''
install -Dm755 m33-linux $out/bin/m33-linux 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 install -Dm755 90-micro-3d-local.rules $out/lib/udev/rules.d/90-micro-3d-local.rules