Merge pull request #13680 from matthewbauer/darwin-fluidsynth

fluidsynth: fix build errors in darwin builds

+7 -4
+4 -3
pkgs/applications/audio/fluidsynth/default.nix
··· 1 1 { stdenv, fetchurl, alsaLib, glib, libjack2, libsndfile, pkgconfig 2 - , libpulseaudio }: 2 + , libpulseaudio, CoreServices, CoreAudio, AudioUnit }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 name = "fluidsynth-${version}"; ··· 18 18 ''; 19 19 20 20 NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin 21 - "-framework CoreAudio"; 21 + "-framework CoreAudio -framework CoreServices"; 22 22 23 23 buildInputs = [ glib libsndfile pkgconfig ] 24 - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ]; 24 + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ] 25 + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreAudio AudioUnit ]; 25 26 26 27 meta = with stdenv.lib; { 27 28 description = "Real-time software synthesizer based on the SoundFont 2 specifications";
+3 -1
pkgs/top-level/all-packages.nix
··· 12112 12112 12113 12113 fldigi = callPackage ../applications/audio/fldigi { }; 12114 12114 12115 - fluidsynth = callPackage ../applications/audio/fluidsynth { }; 12115 + fluidsynth = callPackage ../applications/audio/fluidsynth { 12116 + inherit (darwin.apple_sdk.frameworks) CoreServices CoreAudio AudioUnit; 12117 + }; 12116 12118 12117 12119 fmit = qt5.callPackage ../applications/audio/fmit { }; 12118 12120