From ca7253dfc9205213194c09b7c51228d6819bade9 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Mon, 26 Jan 2026 02:15:15 +0100
Subject: [PATCH] yabridge{,ctl}: move to pkgs/by-name

this shouldn't create any rebuilds
---
 .../ya}/yabridge/hardcode-dependencies.patch              | 0
 .../ya}/yabridge/libyabridge-drop-32-bit-support.patch    | 0
 .../ya}/yabridge/libyabridge-from-nix-profiles.patch      | 0
 .../default.nix => by-name/ya/yabridge/package.nix}       | 4 +++-
 .../ya}/yabridgectl/chainloader-from-nix-profiles.patch   | 0
 .../default.nix => by-name/ya/yabridgectl/package.nix}    | 4 ++--
 .../ya}/yabridgectl/remove-dependency-verification.patch  | 0
 pkgs/top-level/all-packages.nix                           | 8 --------
 8 files changed, 5 insertions(+), 11 deletions(-)
 rename pkgs/{tools/audio => by-name/ya}/yabridge/hardcode-dependencies.patch (100%)
 rename pkgs/{tools/audio => by-name/ya}/yabridge/libyabridge-drop-32-bit-support.patch (100%)
 rename pkgs/{tools/audio => by-name/ya}/yabridge/libyabridge-from-nix-profiles.patch (100%)
 rename pkgs/{tools/audio/yabridge/default.nix => by-name/ya/yabridge/package.nix} (98%)
 rename pkgs/{tools/audio => by-name/ya}/yabridgectl/chainloader-from-nix-profiles.patch (100%)
 rename pkgs/{tools/audio/yabridgectl/default.nix => by-name/ya/yabridgectl/package.nix} (94%)
 rename pkgs/{tools/audio => by-name/ya}/yabridgectl/remove-dependency-verification.patch (100%)

diff --git a/pkgs/tools/audio/yabridge/hardcode-dependencies.patch b/pkgs/by-name/ya/yabridge/hardcode-dependencies.patch
similarity index 100%
rename from pkgs/tools/audio/yabridge/hardcode-dependencies.patch
rename to pkgs/by-name/ya/yabridge/hardcode-dependencies.patch
diff --git a/pkgs/tools/audio/yabridge/libyabridge-drop-32-bit-support.patch b/pkgs/by-name/ya/yabridge/libyabridge-drop-32-bit-support.patch
similarity index 100%
rename from pkgs/tools/audio/yabridge/libyabridge-drop-32-bit-support.patch
rename to pkgs/by-name/ya/yabridge/libyabridge-drop-32-bit-support.patch
diff --git a/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch b/pkgs/by-name/ya/yabridge/libyabridge-from-nix-profiles.patch
similarity index 100%
rename from pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch
rename to pkgs/by-name/ya/yabridge/libyabridge-from-nix-profiles.patch
diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/by-name/ya/yabridge/package.nix
similarity index 98%
rename from pkgs/tools/audio/yabridge/default.nix
rename to pkgs/by-name/ya/yabridge/package.nix
index 553712f2222b..378e2231744e 100644
--- a/pkgs/tools/audio/yabridge/default.nix
+++ b/pkgs/by-name/ya/yabridge/package.nix
@@ -8,12 +8,14 @@
   meson,
   ninja,
   pkg-config,
-  wine,
+  wineWowPackages,
   libxcb,
   nix-update-script,
 }:
 
 let
+  wine = wineWowPackages.yabridge;
+
   # Derived from subprojects/asio.wrap
   asio = fetchFromGitHub {
     owner = "chriskohlhoff";
diff --git a/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch b/pkgs/by-name/ya/yabridgectl/chainloader-from-nix-profiles.patch
similarity index 100%
rename from pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch
rename to pkgs/by-name/ya/yabridgectl/chainloader-from-nix-profiles.patch
diff --git a/pkgs/tools/audio/yabridgectl/default.nix b/pkgs/by-name/ya/yabridgectl/package.nix
similarity index 94%
rename from pkgs/tools/audio/yabridgectl/default.nix
rename to pkgs/by-name/ya/yabridgectl/package.nix
index aba3c158d691..53ee5714dc87 100644
--- a/pkgs/tools/audio/yabridgectl/default.nix
+++ b/pkgs/by-name/ya/yabridgectl/package.nix
@@ -3,7 +3,7 @@
   rustPlatform,
   yabridge,
   makeWrapper,
-  wine,
+  wineWowPackages,
 }:
 
 rustPlatform.buildRustPackage {
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage {
     wrapProgram "$out/bin/yabridgectl" \
       --prefix PATH : ${
         lib.makeBinPath [
-          wine # winedump
+          wineWowPackages.yabridge # winedump
         ]
       }
   '';
diff --git a/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch b/pkgs/by-name/ya/yabridgectl/remove-dependency-verification.patch
similarity index 100%
rename from pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch
rename to pkgs/by-name/ya/yabridgectl/remove-dependency-verification.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ac4157d6440..53fb30c0d1ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1067,14 +1067,6 @@ with pkgs;
 
   winbox = winbox3;
 
-  yabridge = callPackage ../tools/audio/yabridge {
-    wine = wineWowPackages.yabridge;
-  };
-
-  yabridgectl = callPackage ../tools/audio/yabridgectl {
-    wine = wineWowPackages.yabridge;
-  };
-
   ### APPLICATIONS/VERSION-MANAGEMENT
 
   # The full-featured Git.