about summary refs log tree commit diff
path: root/pkgs/applications/audio/fluidsynth
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-05-01 11:46:16 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2019-05-01 11:46:16 +0200
commitbd9e44fce3cb3bb0200f238ea7e89ff3b183b1ee (patch)
treece14ea68baea6afac0e80530e365ac22910dc0b7 /pkgs/applications/audio/fluidsynth
parentd5b3b356de63e676b623aa2a49884a580d0ba507 (diff)
parentf13778392713bca1aca3b9252c727cf0556d6b2b (diff)
downloadnixlib-bd9e44fce3cb3bb0200f238ea7e89ff3b183b1ee.tar
nixlib-bd9e44fce3cb3bb0200f238ea7e89ff3b183b1ee.tar.gz
nixlib-bd9e44fce3cb3bb0200f238ea7e89ff3b183b1ee.tar.bz2
nixlib-bd9e44fce3cb3bb0200f238ea7e89ff3b183b1ee.tar.lz
nixlib-bd9e44fce3cb3bb0200f238ea7e89ff3b183b1ee.tar.xz
nixlib-bd9e44fce3cb3bb0200f238ea7e89ff3b183b1ee.tar.zst
nixlib-bd9e44fce3cb3bb0200f238ea7e89ff3b183b1ee.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/audio/fluidsynth')
-rw-r--r--pkgs/applications/audio/fluidsynth/default.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index 5ea4a6d9f31e..404c9cc825e9 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -32,11 +32,11 @@ stdenv.mkDerivation  rec {
 
   nativeBuildInputs = [ pkgconfig cmake ];
 
-  buildInputs = [ glib libsndfile ]
-    ++ lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ]
+  buildInputs = [ glib libsndfile libpulseaudio libjack2 ]
+    ++ lib.optionals stdenv.isLinux [ alsaLib ]
     ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ];
 
-  cmakeFlags = lib.optional stdenv.isDarwin "-Denable-framework=off";
+  cmakeFlags = [ "-Denable-framework=off" ];
 
   meta = with lib; {
     description = "Real-time software synthesizer based on the SoundFont 2 specifications";
@@ -44,6 +44,5 @@ stdenv.mkDerivation  rec {
     license     = licenses.lgpl21Plus;
     maintainers = with maintainers; [ goibhniu lovek323 ];
     platforms   = platforms.unix;
-    badPlatforms = [ "x86_64-darwin" ];
   };
 }