diff --git a/pkgs/by-name/br/bristol/package.nix b/pkgs/by-name/br/bristol/package.nix index 2251225e68d7..54d9f4670361 100644 --- a/pkgs/by-name/br/bristol/package.nix +++ b/pkgs/by-name/br/bristol/package.nix @@ -5,8 +5,10 @@ alsa-lib, libjack2, pkg-config, + libX11, + libXext, + xorgproto, libpulseaudio, - xorg, copyDesktopItems, makeDesktopItem, }: @@ -17,31 +19,38 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/bristol/${pname}-${version}.tar.gz"; - sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx"; + hash = "sha256-fR8LvQ19MD/HfGuVSbYXCNeoO03AB4GAEbH1XR+pIro="; }; nativeBuildInputs = [ pkg-config copyDesktopItems ]; + buildInputs = [ alsa-lib libjack2 libpulseaudio - xorg.libX11 - xorg.libXext - xorg.xorgproto + libX11 + libXext + xorgproto ]; - patchPhase = "sed -i '41,43d' libbristolaudio/audioEngineJack.c"; # disable alsa/iatomic + postPatch = '' + sed -i '41,43d' libbristolaudio/audioEngineJack.c # disable alsa/iatomic + sed -i '35i void doPitchWheel(Baudio *baudio);' bristol/bristolmemorymoog.c + ''; - configurePhase = "./configure --prefix=$out --enable-jack-default-audio --enable-jack-default-midi"; + configureFlags = [ + "--enable-jack-default-audio" + "--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"; + env.NIX_CFLAGS_COMPILE = "-fcommon -Wno-implicit-int"; preInstall = '' sed -e "s@\`which bristol\`@$out/bin/bristol@g" -i bin/startBristol @@ -64,10 +73,10 @@ stdenv.mkDerivation rec { }) ]; - meta = with lib; { + meta = { description = "Range of synthesiser, electric piano and organ emulations"; homepage = "https://bristol.sourceforge.net"; - license = licenses.gpl3; + license = lib.licenses.gpl3; platforms = [ "x86_64-linux" "i686-linux"