summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfigsoda <figsoda@pm.me>2023-05-23 11:36:34 -0400
committerGitHub <noreply@github.com>2023-05-23 11:36:34 -0400
commitdbb3ffd0a826c4abbccb4a69fb5aa1392d16814e (patch)
treebc37e09291e93a620b996e92b21ea9f245dd7dc1
parentMerge pull request #233518 from tie/bios-bootable-x86 (diff)
parentbespokesynth: Fix build on Darwin (diff)
downloadnixpkgs-dbb3ffd0a826c4abbccb4a69fb5aa1392d16814e.tar.gz
Merge pull request #230730 from OPNA2608/fix/JUCE-pkgs-darwin
Fix some JUCE packages on Darwin
-rw-r--r--pkgs/applications/audio/bespokesynth/default.nix4
-rw-r--r--pkgs/applications/audio/dexed/default.nix2
-rw-r--r--pkgs/applications/audio/fire/default.nix2
-rw-r--r--pkgs/top-level/all-packages.nix6
4 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix
index 919768d58ed7..ad19192ce70c 100644
--- a/pkgs/applications/audio/bespokesynth/default.nix
+++ b/pkgs/applications/audio/bespokesynth/default.nix
@@ -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 [
diff --git a/pkgs/applications/audio/dexed/default.nix b/pkgs/applications/audio/dexed/default.nix
index 67d9a56a1d0c..d7e8b0fd2380 100644
--- a/pkgs/applications/audio/dexed/default.nix
+++ b/pkgs/applications/audio/dexed/default.nix
@@ -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
diff --git a/pkgs/applications/audio/fire/default.nix b/pkgs/applications/audio/fire/default.nix
index 93536944d96d..c1ccad191602 100644
--- a/pkgs/applications/audio/fire/default.nix
+++ b/pkgs/applications/audio/fire/default.nix
@@ -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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4b1687401ce..330445c932b5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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;
};