Merge pull request #32462 from magnetophon/fluidsynth

fluidsynth: 1.1.6 -> 1.1.8
This commit is contained in:
Orivej Desh 2017-12-09 10:37:09 +00:00 committed by GitHub
commit 5ce5ef06ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 21 deletions

View File

@ -1,34 +1,31 @@
{ stdenv, fetchurl, alsaLib, glib, libjack2, libsndfile, pkgconfig { stdenv, lib, fetchFromGitHub, pkgconfig, cmake
, libpulseaudio, CoreServices, CoreAudio, AudioUnit }: , alsaLib, glib, libjack2, libsndfile, libpulseaudio
, AudioUnit, CoreAudio, CoreMIDI, CoreServices
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "fluidsynth-${version}"; name = "fluidsynth-${version}";
version = "1.1.6"; version = "1.1.8";
src = fetchurl { src = fetchFromGitHub {
url = "mirror://sourceforge/fluidsynth/${name}.tar.bz2"; owner = "FluidSynth";
sha256 = "00gn93bx4cz9bfwf3a8xyj2by7w23nca4zxf09ll53kzpzglg2yj"; repo = "fluidsynth";
rev = "v${version}";
sha256 = "12q7hv0zvgylsdj1ipssv5zr7ap2y410dxsd63dz22y05fa2hwwd";
}; };
preBuild = stdenv.lib.optionalString stdenv.isDarwin '' nativeBuildInputs = [ pkgconfig cmake ];
sed -i '40 i\
#include <CoreAudio/AudioHardware.h>\
#include <CoreAudio/AudioHardwareDeprecated.h>' \
src/drivers/fluid_coreaudio.c
'';
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin
"-framework CoreAudio -framework CoreServices";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libsndfile ] buildInputs = [ glib libsndfile ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ] ++ lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreAudio AudioUnit ]; ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ];
meta = with stdenv.lib; { cmakeFlags = lib.optional stdenv.isDarwin "-Denable-framework=off";
meta = with lib; {
description = "Real-time software synthesizer based on the SoundFont 2 specifications"; description = "Real-time software synthesizer based on the SoundFont 2 specifications";
homepage = http://www.fluidsynth.org; homepage = http://www.fluidsynth.org;
license = licenses.lgpl2; license = licenses.lgpl21Plus;
maintainers = with maintainers; [ goibhniu lovek323 ]; maintainers = with maintainers; [ goibhniu lovek323 ];
platforms = platforms.unix; platforms = platforms.unix;
}; };

View File

@ -14681,7 +14681,7 @@ with pkgs;
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; inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices;
}; };
fmit = libsForQt5.callPackage ../applications/audio/fmit { }; fmit = libsForQt5.callPackage ../applications/audio/fmit { };