From 6b5473f7a2073f8e522dbbc5caeeda222a23c710 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 31 Dec 2024 21:56:23 +0100
Subject: [PATCH 1/2] bossa: move to pkgs/by-name

---
 .../arduino.nix => by-name/bo/bossa-arduino/package.nix}      | 0
 pkgs/{development/embedded => by-name/bo}/bossa/bin2c.c       | 0
 .../bossa/default.nix => by-name/bo/bossa/package.nix}        | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 4 files changed, 4 deletions(-)
 rename pkgs/{development/embedded/bossa/arduino.nix => by-name/bo/bossa-arduino/package.nix} (100%)
 rename pkgs/{development/embedded => by-name/bo}/bossa/bin2c.c (100%)
 rename pkgs/{development/embedded/bossa/default.nix => by-name/bo/bossa/package.nix} (100%)

diff --git a/pkgs/development/embedded/bossa/arduino.nix b/pkgs/by-name/bo/bossa-arduino/package.nix
similarity index 100%
rename from pkgs/development/embedded/bossa/arduino.nix
rename to pkgs/by-name/bo/bossa-arduino/package.nix
diff --git a/pkgs/development/embedded/bossa/bin2c.c b/pkgs/by-name/bo/bossa/bin2c.c
similarity index 100%
rename from pkgs/development/embedded/bossa/bin2c.c
rename to pkgs/by-name/bo/bossa/bin2c.c
diff --git a/pkgs/development/embedded/bossa/default.nix b/pkgs/by-name/bo/bossa/package.nix
similarity index 100%
rename from pkgs/development/embedded/bossa/default.nix
rename to pkgs/by-name/bo/bossa/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 844ba5a100d6..69a117607478 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7861,10 +7861,6 @@ with pkgs;
 
   black-macchiato = with python3Packages; toPythonApplication black-macchiato;
 
-  bossa = callPackage ../development/embedded/bossa { };
-
-  bossa-arduino = callPackage ../development/embedded/bossa/arduino.nix { };
-
   buck = callPackage ../development/tools/build-managers/buck {
     python3 = python311;
   };

From b7e0a69827b8902beff8eeebb26e4b400a6a1232 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 31 Dec 2024 21:58:20 +0100
Subject: [PATCH 2/2] bossa: fix darwin build

---
 pkgs/by-name/bo/bossa/package.nix | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/bo/bossa/package.nix b/pkgs/by-name/bo/bossa/package.nix
index 05c2d3faddfc..1a108f0a712d 100644
--- a/pkgs/by-name/bo/bossa/package.nix
+++ b/pkgs/by-name/bo/bossa/package.nix
@@ -5,7 +5,6 @@
   wxGTK32,
   libX11,
   readline,
-  darwin,
   fetchpatch,
 }:
 
@@ -48,15 +47,11 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ bin2c ];
-  buildInputs =
-    [
-      wxGTK32
-      libX11
-      readline
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.apple_sdk.frameworks.Cocoa
-    ];
+  buildInputs = [
+    wxGTK32
+    libX11
+    readline
+  ];
 
   makeFlags = [
     "WXVERSION=3.2"
@@ -65,7 +60,15 @@ stdenv.mkDerivation rec {
     "bin/bossash"
     "bin/bossa"
   ];
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
+  env.NIX_CFLAGS_COMPILE = toString (
+    [
+      "-Wno-error=deprecated-declarations"
+    ]
+    ++ lib.optionals stdenv.cc.isClang [
+      "-Wno-error=vla-cxx-extension"
+    ]
+  );
 
   installPhase = ''
     mkdir -p $out/bin