From 610532ac6a9c652c54dcbe1ef558ddd726fc969b Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 5 Dec 2013 07:42:48 +0200 Subject: [PATCH] Revert "fluidsynth: switch to cmake build system" which causes mpd and calf to fail to detect fluidsynth. This reverts commit cd16faa25738e1fd885279b0707e6a842e5479c8. --- pkgs/applications/audio/fluidsynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index d9998a9f814..89e95f62cd5 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, glib, jackaudio, libsndfile, pkgconfig -, pulseaudio, cmake }: +, pulseaudio }: stdenv.mkDerivation rec { name = "fluidsynth-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework CoreAudio"; - buildInputs = [ cmake glib libsndfile pkgconfig ] + buildInputs = [ glib libsndfile pkgconfig ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jackaudio ]; meta = with stdenv.lib; {