bossa: fix darwin build (#369779)
This commit is contained in:
@@ -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
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user