public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fluidsynth: fix build errors in darwin builds

Browse Source 
Build inputs were not being passed in properly.
This commit is contained in:
Matthew Bauer 2016-03-04 14:09:24 -06:00
parent b0f70e2ebb
commit a1363ef02d
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/audio/fluidsynth/default.nix
View File

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

4
pkgs/top-level/all-packages.nix
View File

@ -12100,7 +12100,9 @@ let
fldigi = callPackage ../applications/audio/fldigi { }; 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 { }; fmit = qt5.callPackage ../applications/audio/fmit { };