Skip to content

Commit

Permalink
Merge #227458: fluidsynth: fix darwin build for 2.3.2
Browse files Browse the repository at this point in the history
...into staging-next
  • Loading branch information
vcunat committed Apr 22, 2023
2 parents e7eb209 + 77af101 commit 90520cf
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions pkgs/applications/audio/fluidsynth/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, buildPackages, pkg-config, cmake
, alsa-lib, glib, libjack2, libsndfile, libpulseaudio
, AudioUnit, CoreAudio, CoreMIDI, CoreServices
, AppKit, AudioUnit, CoreAudio, CoreMIDI, CoreServices
}:

stdenv.mkDerivation rec {
Expand All @@ -18,7 +18,7 @@ stdenv.mkDerivation rec {

buildInputs = [ glib libsndfile libjack2 ]
++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio ]
++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ];
++ lib.optionals stdenv.isDarwin [ AppKit AudioUnit CoreAudio CoreMIDI CoreServices ];

cmakeFlags = [
"-Denable-framework=off"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29998,7 +29998,7 @@ with pkgs;
flwrap = callPackage ../applications/radio/flwrap { stdenv = gcc10StdenvCompat; };

fluidsynth = callPackage ../applications/audio/fluidsynth {
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices;
inherit (darwin.apple_sdk.frameworks) AppKit AudioUnit CoreAudio CoreMIDI CoreServices;
};

fmit = libsForQt5.callPackage ../applications/audio/fmit { };
Expand Down

0 comments on commit 90520cf

Please sign in to comment.