Unverified Commit dbb3ffd0 authored by figsoda's avatar figsoda Committed by GitHub
Browse files

Merge pull request #230730 from OPNA2608/fix/JUCE-pkgs-darwin

Fix some JUCE packages on Darwin
parents 0d139623 5b905627
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -30,10 +30,12 @@
, pcre
, mount
, gnome
, Accelerate
, Cocoa
, WebKit
, CoreServices
, CoreAudioKit
, IOBluetooth
  # It is not allowed to distribute binaries with the VST2 SDK plugin without a license
  # (the author of Bespoke has such a licence but not Nix). VST3 should work out of the box.
  # Read more in https://github.com/NixOS/nixpkgs/issues/145607
@@ -102,10 +104,12 @@ stdenv.mkDerivation rec {
    pcre
    mount
  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
    Accelerate
    Cocoa
    WebKit
    CoreServices
    CoreAudioKit
    IOBluetooth
  ];

  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [
+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@
, freetype
, alsa-lib
, libjack2
, Accelerate
, Cocoa
, WebKit
, MetalKit
@@ -52,6 +53,7 @@ stdenv.mkDerivation rec {
    alsa-lib
    libjack2
  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
    Accelerate
    Cocoa
    WebKit
    MetalKit
+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@
, libXcursor
, freetype
, alsa-lib
, Accelerate
, Cocoa
, WebKit
, CoreServices
@@ -76,6 +77,7 @@ stdenv.mkDerivation rec {
    freetype
    alsa-lib
  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
    Accelerate
    Cocoa
    WebKit
    CoreServices
+3 −3
Original line number Diff line number Diff line
@@ -29456,7 +29456,7 @@ with pkgs;
  berry = callPackage ../applications/window-managers/berry { };
  bespokesynth = callPackage ../applications/audio/bespokesynth {
    inherit (darwin.apple_sdk.frameworks) Cocoa WebKit CoreServices CoreAudioKit;
    inherit (darwin.apple_sdk.frameworks) Accelerate Cocoa WebKit CoreServices CoreAudioKit IOBluetooth;
  };
  bespokesynth-with-vst2 = bespokesynth.override {
@@ -30035,7 +30035,7 @@ with pkgs;
  denemo = callPackage ../applications/audio/denemo { };
  dexed = darwin.apple_sdk_11_0.callPackage ../applications/audio/dexed {
    inherit (darwin.apple_sdk_11_0.frameworks) Cocoa WebKit MetalKit DiscRecording CoreAudioKit;
    inherit (darwin.apple_sdk_11_0.frameworks) Accelerate Cocoa WebKit MetalKit DiscRecording CoreAudioKit;
    inherit (darwin.apple_sdk_11_0.libs) simd;
  };
@@ -30673,7 +30673,7 @@ with pkgs;
  filezilla = callPackage ../applications/networking/ftp/filezilla { };
  fire = darwin.apple_sdk_11_0.callPackage ../applications/audio/fire {
    inherit (darwin.apple_sdk_11_0.frameworks) Cocoa WebKit CoreServices DiscRecording CoreAudioKit MetalKit;
    inherit (darwin.apple_sdk_11_0.frameworks) Accelerate Cocoa WebKit CoreServices DiscRecording CoreAudioKit MetalKit;
    inherit (darwin.apple_sdk_11_0.libs) simd;
  };