Merge pull request #13680 from matthewbauer/darwin-fluidsynth

fluidsynth: fix build errors in darwin builds
This commit is contained in:
Arseniy Seroka 2016-03-06 23:22:45 +03:00
commit e82dcd70e4
2 changed files with 7 additions and 4 deletions

@ -1,5 +1,5 @@
{ stdenv, fetchurl, alsaLib, glib, libjack2, libsndfile, pkgconfig
, libpulseaudio }:
, libpulseaudio, CoreServices, CoreAudio, AudioUnit }:
stdenv.mkDerivation rec {
name = "fluidsynth-${version}";
@ -18,10 +18,11 @@ stdenv.mkDerivation rec {
'';
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin
"-framework CoreAudio";
"-framework CoreAudio -framework CoreServices";
buildInputs = [ glib libsndfile pkgconfig ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ];
++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreAudio AudioUnit ];
meta = with stdenv.lib; {
description = "Real-time software synthesizer based on the SoundFont 2 specifications";

@ -12112,7 +12112,9 @@ let
fldigi = callPackage ../applications/audio/fldigi { };
fluidsynth = callPackage ../applications/audio/fluidsynth { };
fluidsynth = callPackage ../applications/audio/fluidsynth {
inherit (darwin.apple_sdk.frameworks) CoreServices CoreAudio AudioUnit;
};
fmit = qt5.callPackage ../applications/audio/fmit { };