Unverified Commit c384fe2b authored by Michael Daniels's avatar Michael Daniels Committed by GitHub
Browse files

bristol: fix build with gcc15 (#502323)

parents 92d057c9 baf4a1cb

pkgs/by-name/br/bristol/package.nix

+11 −5
Original line number Diff line number Diff line
@@ -46,11 +46,17 @@ stdenv.mkDerivation (finalAttrs: { 
    "--enable-jack-default-midi"

  ];



  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

  env.NIX_CFLAGS_COMPILE = "-fcommon -Wno-implicit-int";

    "-fcommon"

    # gcc14

    "-Wno-implicit-int"

    # gcc15

    "-std=gnu17"

  ];



  preInstall = ''

    sed -e "s@\`which bristol\`@$out/bin/bristol@g" -i bin/startBristol