From ebdf35c4363d50703b134d859ccf327b3dc7d031 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 23 Dec 2024 23:45:06 +0100 Subject: [PATCH] bespokesynth: Move to by-name --- .../be/bespokesynth/package.nix} | 21 ++----------------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 23 deletions(-) rename pkgs/{applications/audio/bespokesynth/default.nix => by-name/be/bespokesynth/package.nix} (91%) diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/by-name/be/bespokesynth/package.nix similarity index 91% rename from pkgs/applications/audio/bespokesynth/default.nix rename to pkgs/by-name/be/bespokesynth/package.nix index 3bf68d11bd88..f2bf3a98d339 100644 --- a/pkgs/applications/audio/bespokesynth/default.nix +++ b/pkgs/by-name/be/bespokesynth/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, fetchzip, gitUpdater, + apple-sdk_11, cmake, pkg-config, ninja, @@ -33,13 +34,6 @@ pcre, mount, zenity, - Accelerate, - Cocoa, - WebKit, - CoreServices, - CoreAudioKit, - IOBluetooth, - MetalKit, # 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 @@ -138,20 +132,9 @@ stdenv.mkDerivation (finalAttrs: { mount ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - Cocoa - WebKit - CoreServices - CoreAudioKit - IOBluetooth - MetalKit + apple-sdk_11 ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ - # Fails to find fp.h on its own - "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/Current/Frameworks/CarbonCore.framework/Versions/Current/Headers/" - ]); - postInstall = if stdenv.hostPlatform.isDarwin then '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7057e2550531..106e18c484cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13213,10 +13213,6 @@ with pkgs; barrier = libsForQt5.callPackage ../applications/misc/barrier { }; - bespokesynth = darwin.apple_sdk_11_0.callPackage ../applications/audio/bespokesynth { - inherit (darwin.apple_sdk_11_0.frameworks) Accelerate Cocoa WebKit CoreServices CoreAudioKit IOBluetooth MetalKit; - }; - bespokesynth-with-vst2 = bespokesynth.override { enableVST2 = true; };