From 04456da1d77a4a2253b6c51d8a5ecc497b99ae9f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 3 Jan 2025 22:07:56 +0100 Subject: [PATCH 1/2] termusic: move to pkgs/by-name --- .../termusic/default.nix => by-name/te/termusic/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{applications/audio/termusic/default.nix => by-name/te/termusic/package.nix} (100%) diff --git a/pkgs/applications/audio/termusic/default.nix b/pkgs/by-name/te/termusic/package.nix similarity index 100% rename from pkgs/applications/audio/termusic/default.nix rename to pkgs/by-name/te/termusic/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58f4ab07d90a..9b4b711cb15d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1089,7 +1089,7 @@ with pkgs; tailwindcss = callPackage ../development/tools/tailwindcss { }; - termusic = darwin.apple_sdk_11_0.callPackage ../applications/audio/termusic { + termusic = darwin.apple_sdk_11_0.callPackage ../by-name/te/termusic/package.nix { inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudio CoreGraphics Foundation IOKit MediaPlayer Security; }; From 3aefa6206f31e34eff5daba2e3caa074f46e7c55 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 3 Jan 2025 22:15:06 +0100 Subject: [PATCH 2/2] termusic: use new apple sdk pattern --- pkgs/by-name/te/termusic/package.nix | 16 ---------------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 20 deletions(-) diff --git a/pkgs/by-name/te/termusic/package.nix b/pkgs/by-name/te/termusic/package.nix index afc767749a3d..a1f7c3beddcd 100644 --- a/pkgs/by-name/te/termusic/package.nix +++ b/pkgs/by-name/te/termusic/package.nix @@ -1,23 +1,16 @@ { alsa-lib, - AppKit, - CoreAudio, - CoreGraphics, dbus, - Foundation, fetchFromGitHub, fetchpatch, glib, gst_all_1, - IOKit, lib, - MediaPlayer, mpv-unwrapped, openssl, pkg-config, protobuf, rustPlatform, - Security, sqlite, stdenv, }: @@ -76,15 +69,6 @@ rustPlatform.buildRustPackage rec { openssl sqlite ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - CoreAudio - CoreGraphics - Foundation - IOKit - MediaPlayer - Security - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b4b711cb15d..56847ec77853 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1089,10 +1089,6 @@ with pkgs; tailwindcss = callPackage ../development/tools/tailwindcss { }; - termusic = darwin.apple_sdk_11_0.callPackage ../by-name/te/termusic/package.nix { - inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudio CoreGraphics Foundation IOKit MediaPlayer Security; - }; - ufolint = with python3Packages; toPythonApplication ufolint; valeronoi = qt6Packages.callPackage ../tools/misc/valeronoi { };