Merge pull request #309519 from pluiedev/zhf-24.05/bossa

bossa: fix build failure on Darwin with clang >= 15
2024-05-06 14:29:45 +02:00
parent 792e1b4108 9c540730ea
commit 571223ed9c
1 changed files with 10 additions and 0 deletions
@@ -5,6 +5,7 @@
 , libX11
 , readline
 , darwin
+, fetchpatch
 }:

 let
@@ -31,6 +32,15 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-8M3MU/+Y1L6SaQ1yoC9Z27A/gGruZdopLnL1z7h7YJw=";
  };

+  patches = [
+    (fetchpatch {
+      # Required for building on Darwin with clang >=15.
+      name = "pr-172-fix.patch";
+      url = "https://github.com/shumatech/BOSSA/commit/6e54973c3c758674c3d04b5e2cf12e097006f6a3.patch";
+      hash = "sha256-2lp6Ej3IfofztC1n/yHLjabn0MH4BA/CM3dsnAw8klA=";
+    })
+  ];
+
  postPatch = ''
    substituteInPlace Makefile \
      --replace "-arch x86_64" ""