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] 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