diff options
author | Orivej Desh <orivej@gmx.fr> | 2017-12-09 10:37:09 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-09 10:37:09 +0000 |
commit | 5ce5ef06ab49a50f1a4a6b437d84bf43288d0b7e (patch) | |
tree | 0b3a7f9dc887da966c3b9aed1e97734ec0c60088 /pkgs/applications/audio | |
parent | 347fdc03ca8edf7dee1de59e6e49e2e33f26883d (diff) | |
parent | 95ef6622a70264b0064b3ad664d660342d06c533 (diff) | |
download | nixpkgs-5ce5ef06ab49a50f1a4a6b437d84bf43288d0b7e.tar nixpkgs-5ce5ef06ab49a50f1a4a6b437d84bf43288d0b7e.tar.gz nixpkgs-5ce5ef06ab49a50f1a4a6b437d84bf43288d0b7e.tar.bz2 nixpkgs-5ce5ef06ab49a50f1a4a6b437d84bf43288d0b7e.tar.lz nixpkgs-5ce5ef06ab49a50f1a4a6b437d84bf43288d0b7e.tar.xz nixpkgs-5ce5ef06ab49a50f1a4a6b437d84bf43288d0b7e.tar.zst nixpkgs-5ce5ef06ab49a50f1a4a6b437d84bf43288d0b7e.zip |
Merge pull request #32462 from magnetophon/fluidsynth
fluidsynth: 1.1.6 -> 1.1.8
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/fluidsynth/default.nix | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index a8bf05187e3..50689886fdd 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,34 +1,31 @@ -{ stdenv, fetchurl, alsaLib, glib, libjack2, libsndfile, pkgconfig -, libpulseaudio, CoreServices, CoreAudio, AudioUnit }: +{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake +, alsaLib, glib, libjack2, libsndfile, libpulseaudio +, AudioUnit, CoreAudio, CoreMIDI, CoreServices +}: stdenv.mkDerivation rec { name = "fluidsynth-${version}"; - version = "1.1.6"; + version = "1.1.8"; - src = fetchurl { - url = "mirror://sourceforge/fluidsynth/${name}.tar.bz2"; - sha256 = "00gn93bx4cz9bfwf3a8xyj2by7w23nca4zxf09ll53kzpzglg2yj"; + src = fetchFromGitHub { + owner = "FluidSynth"; + repo = "fluidsynth"; + rev = "v${version}"; + sha256 = "12q7hv0zvgylsdj1ipssv5zr7ap2y410dxsd63dz22y05fa2hwwd"; }; - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i '40 i\ - #include <CoreAudio/AudioHardware.h>\ - #include <CoreAudio/AudioHardwareDeprecated.h>' \ - src/drivers/fluid_coreaudio.c - ''; + nativeBuildInputs = [ pkgconfig cmake ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin - "-framework CoreAudio -framework CoreServices"; - - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libsndfile ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreAudio AudioUnit ]; + ++ lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ] + ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ]; + + cmakeFlags = lib.optional stdenv.isDarwin "-Denable-framework=off"; - meta = with stdenv.lib; { + meta = with lib; { description = "Real-time software synthesizer based on the SoundFont 2 specifications"; homepage = http://www.fluidsynth.org; - license = licenses.lgpl2; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ goibhniu lovek323 ]; platforms = platforms.unix; }; |