diff options
author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-03-06 23:22:45 +0300 |
---|---|---|
committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-03-06 23:22:45 +0300 |
commit | e82dcd70e44238dd6a9b30cc3359e5a5f0139e8a (patch) | |
tree | 5224cf6c8e363f20f6be0fd3a0b7e35eec76a591 | |
parent | d99033beb928edb040e9302904b7a736344e5bbf (diff) | |
parent | a1363ef02d1ca75f3ca84e6d590cd1b7b7b084b7 (diff) | |
download | nixpkgs-e82dcd70e44238dd6a9b30cc3359e5a5f0139e8a.tar nixpkgs-e82dcd70e44238dd6a9b30cc3359e5a5f0139e8a.tar.gz nixpkgs-e82dcd70e44238dd6a9b30cc3359e5a5f0139e8a.tar.bz2 nixpkgs-e82dcd70e44238dd6a9b30cc3359e5a5f0139e8a.tar.lz nixpkgs-e82dcd70e44238dd6a9b30cc3359e5a5f0139e8a.tar.xz nixpkgs-e82dcd70e44238dd6a9b30cc3359e5a5f0139e8a.tar.zst nixpkgs-e82dcd70e44238dd6a9b30cc3359e5a5f0139e8a.zip |
Merge pull request #13680 from matthewbauer/darwin-fluidsynth
fluidsynth: fix build errors in darwin builds
-rw-r--r-- | pkgs/applications/audio/fluidsynth/default.nix | 7 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index bd35b78fbc0..bb37cac5500 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee54f66f222..7c81b48f31f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |