From b3a116c76205c9e785de0ee0cfee294c6cb916e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 19 Jan 2014 13:01:49 +0100 Subject: [PATCH] zynaddsubfx: fix build, tidy up, add JACK support --- pkgs/applications/audio/zynaddsubfx/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 8dfac4d78f97..378318fbf855 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, alsaLib, cmake, fftw, fltk13, minixml, pkgconfig, zlib }: +{ stdenv, fetchurl, alsaLib, cmake, jackaudio, fftw, fltk13, minixml +, pkgconfig, zlib +}: stdenv.mkDerivation rec { name = "zynaddsubfx-${version}"; @@ -9,18 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0kgmwyh4rhyqdfrdzhbzjjk2hzggkp9c4aac6sy3xv6cc1b5jjxq"; }; - buildInputs = [ alsaLib fftw fltk13 minixml zlib ]; + buildInputs = [ alsaLib jackaudio fftw fltk13 minixml zlib ]; nativeBuildInputs = [ cmake pkgconfig ]; - patches = [ - (fetchurl { - url = http://patch-tracker.debian.org/patch/series/dl/zynaddsubfx/2.4.0-1.2/09_fluid_1.3.patch; - sha256 = "06wl7fs44b24ls1fzh21596n6zzc3ywm2bcdfrkfiiwpzin3yjq6"; - }) - ]; - -#installPhase = "mkdir -pv $out/bin; cp -v zynaddsubfx $out/bin"; - meta = with stdenv.lib; { description = "high quality software synthesizer"; homepage = http://zynaddsubfx.sourceforge.net;