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 89% rename from pkgs/development/embedded/bossa/default.nix rename to pkgs/by-name/bo/bossa/package.nix index 05c2d3faddfc..1a108f0a712d 100644 --- a/pkgs/development/embedded/bossa/default.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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9508dce9689e..83ceecf7d461 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7849,10 +7849,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; };