From ad5271f7459ff5fcb8ccd7612969dd627e3f8c51 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Mon, 8 Jul 2024 11:14:25 +0200
Subject: [PATCH] musikcube: move to pkgs/by-name

---
 .../default.nix => by-name/mu/musikcube/package.nix}  | 11 +++++------
 pkgs/top-level/all-packages.nix                       |  4 ----
 2 files changed, 5 insertions(+), 10 deletions(-)
 rename pkgs/{applications/audio/musikcube/default.nix => by-name/mu/musikcube/package.nix} (87%)

diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/by-name/mu/musikcube/package.nix
similarity index 87%
rename from pkgs/applications/audio/musikcube/default.nix
rename to pkgs/by-name/mu/musikcube/package.nix
index 1496f3065198..8e3d950a9200 100644
--- a/pkgs/applications/audio/musikcube/default.nix
+++ b/pkgs/by-name/mu/musikcube/package.nix
@@ -24,9 +24,8 @@
 , systemd
 , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd
 # Darwin Dependencies
-, Cocoa
-, SystemConfiguration
-, coreaudioSupport ? stdenv.hostPlatform.isDarwin, CoreAudio
+, darwin
+, coreaudioSupport ? stdenv.hostPlatform.isDarwin
 }:
 
 let
@@ -68,11 +67,11 @@ stdenv.mkDerivation rec {
     systemd
   ] ++ lib.optionals stdenv.isLinux [
     alsa-lib pulseaudio
-  ] ++ lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     Cocoa SystemConfiguration
-  ] ++ lib.optionals coreaudioSupport [
+  ]) ++ lib.optionals coreaudioSupport (with darwin.apple_sdk.frameworks; [
     CoreAudio
-  ] ++ lib.optionals sndioSupport [
+  ]) ++ lib.optionals sndioSupport [
     sndio
   ] ++ lib.optionals pipewireSupport [
     pipewire
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b811e1b5b70..84e6d2ef5c79 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31365,10 +31365,6 @@ with pkgs;
 
   meerk40t-camera = callPackage ../applications/misc/meerk40t/camera.nix { };
 
-  musikcube = callPackage ../applications/audio/musikcube {
-    inherit (darwin.apple_sdk.frameworks) Cocoa CoreAudio SystemConfiguration;
-  };
-
   libmt32emu = callPackage ../applications/audio/munt/libmt32emu.nix { };
 
   mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { };