From baf4a1cbc0db186abc0ca320922baf2d42eb0a41 Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Sun, 22 Mar 2026 15:12:25 -0700 Subject: [PATCH] bristol: fix build with gcc15 --- pkgs/by-name/br/bristol/package.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/br/bristol/package.nix b/pkgs/by-name/br/bristol/package.nix index 7af55ba4eedd..324793c626b1 100644 --- a/pkgs/by-name/br/bristol/package.nix +++ b/pkgs/by-name/br/bristol/package.nix @@ -46,11 +46,17 @@ stdenv.mkDerivation (finalAttrs: { "--enable-jack-default-midi" ]; - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: brightonCLI.o:/build/bristol-0.60.11/brighton/brightonCLI.c:139: multiple definition of - # `event'; brightonMixerMenu.o:/build/bristol-0.60.11/brighton/brightonMixerMenu.c:1182: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon -Wno-implicit-int"; + env.NIX_CFLAGS_COMPILE = toString [ + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: brightonCLI.o:/build/bristol-0.60.11/brighton/brightonCLI.c:139: multiple definition of + # `event'; brightonMixerMenu.o:/build/bristol-0.60.11/brighton/brightonMixerMenu.c:1182: first defined here + "-fcommon" + # gcc14 + "-Wno-implicit-int" + # gcc15 + "-std=gnu17" + ]; preInstall = '' sed -e "s@\`which bristol\`@$out/bin/bristol@g" -i bin/startBristol