diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/package.nix
similarity index 98%
rename from pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
rename to pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/package.nix
index df135d161922..a0255e3fc909 100644
--- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/package.nix
@@ -14,7 +14,7 @@
   obs-studio,
   opencv,
   procps,
-  qtbase,
+  qt6,
   stdenv,
   websocketpp,
   libxscrnsaver,
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     # tesseract
     # leptonica
     procps
-    qtbase
+    qt6.qtbase
     websocketpp
     libxscrnsaver
     libusb1
diff --git a/pkgs/applications/video/obs-studio/plugins/distroav/default.nix b/pkgs/applications/video/obs-studio/plugins/distroav/package.nix
similarity index 97%
rename from pkgs/applications/video/obs-studio/plugins/distroav/default.nix
rename to pkgs/applications/video/obs-studio/plugins/distroav/package.nix
index c223220a29f2..f147e82a68df 100644
--- a/pkgs/applications/video/obs-studio/plugins/distroav/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/distroav/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   obs-studio,
   cmake,
-  qtbase,
+  qt6,
   ndi-6,
   curl,
 }:
@@ -15,12 +15,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    qtbase
+    qt6.qtbase
   ];
 
   buildInputs = [
     obs-studio
-    qtbase
+    qt6.qtbase
     ndi-6
     curl
   ];
diff --git a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/package.nix
similarity index 100%
rename from pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix
rename to pkgs/applications/video/obs-studio/plugins/droidcam-obs/package.nix
diff --git a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix
index d9c108090eac..8f94f1e2b232 100644
--- a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix
+++ b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix
@@ -6,7 +6,7 @@
   pkg-config,
   ninja,
   obs-studio,
-  qtbase,
+  qt6,
   libxt,
   libxtst,
   libxi,
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     obs-studio
-    qtbase
+    qt6.qtbase
     sdl3
     libx11
     libxau
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-aitum-multistream.nix b/pkgs/applications/video/obs-studio/plugins/obs-aitum-multistream.nix
index 9ced9ed8a86b..a8e289c5cf0c 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-aitum-multistream.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-aitum-multistream.nix
@@ -5,7 +5,7 @@
   cmake,
   curl,
   obs-studio,
-  qtbase,
+  qt6,
 }:
 
 stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     curl
     obs-studio
-    qtbase
+    qt6.qtbase
   ];
   dontWrapQtApps = true;
 
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/package.nix
similarity index 100%
rename from pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix
rename to pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/package.nix
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix
index 9391b422a092..1ee4883bc3ab 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   obs-studio,
-  qtbase,
+  qt6,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     obs-studio
-    qtbase
+    qt6.qtbase
   ];
 
   postInstall = ''
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix b/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix
index cd9461ab4a88..1986b9154af3 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   obs-studio,
-  qtbase,
+  qt6,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     obs-studio
-    qtbase
+    qt6.qtbase
   ];
 
   postInstall = ''
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/package.nix
similarity index 98%
rename from pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
rename to pkgs/applications/video/obs-studio/plugins/obs-hyperion/package.nix
index ab8036ac7eaf..2d6cc89b98ac 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   obs-studio,
   libGL,
-  qtbase,
+  qt6,
   flatbuffers,
 }:
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     obs-studio
     flatbuffers
     libGL
-    qtbase
+    qt6.qtbase
   ];
 
   dontWrapQtApps = true;
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/package.nix
similarity index 100%
rename from pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix
rename to pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/package.nix
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-media-controls/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-media-controls/package.nix
similarity index 97%
rename from pkgs/applications/video/obs-studio/plugins/obs-media-controls/default.nix
rename to pkgs/applications/video/obs-studio/plugins/obs-media-controls/package.nix
index 61a1936ae9b0..e36ace4ae2c8 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-media-controls/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-media-controls/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   obs-studio,
-  qtbase,
+  qt6,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     obs-studio
-    qtbase
+    qt6.qtbase
   ];
 
   dontWrapQtApps = true;
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/package.nix
similarity index 98%
rename from pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix
rename to pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/package.nix
index 368325107282..845271956e9f 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   obs-studio,
   cmake,
-  qtbase,
+  qt6,
   fetchpatch,
 }:
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     obs-studio
-    qtbase
+    qt6.qtbase
   ];
 
   cmakeFlags = [
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix
index aadef36a609a..bdd327bf2833 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   obs-studio,
-  qtbase,
+  qt6,
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     obs-studio
-    qtbase
+    qt6.qtbase
   ];
 
   cmakeFlags = [
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-teleport/package.nix
similarity index 100%
rename from pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix
rename to pkgs/applications/video/obs-studio/plugins/obs-teleport/package.nix
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-transition-table.nix b/pkgs/applications/video/obs-studio/plugins/obs-transition-table.nix
index 07ab3bc0f475..cf5e03bb52e8 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-transition-table.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-transition-table.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   obs-studio,
-  qtbase,
+  qt6,
 }:
 
 stdenv.mkDerivation {
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     obs-studio
-    qtbase
+    qt6.qtbase
   ];
 
   dontWrapQtApps = true;
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-tuna/package.nix
similarity index 93%
rename from pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix
rename to pkgs/applications/video/obs-studio/plugins/obs-tuna/package.nix
index 52fcc213de1f..7a3a774393d3 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-tuna/package.nix
@@ -8,8 +8,7 @@
   curl,
   dbus,
   pkg-config,
-  qtbase,
-  wrapQtAppsHook,
+  qt6,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
   buildInputs = [
     obs-studio
-    qtbase
+    qt6.qtbase
     zlib
     curl
     dbus
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/package.nix
similarity index 100%
rename from pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix
rename to pkgs/applications/video/obs-studio/plugins/obs-vaapi/package.nix
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix
index a77779df1335..735c8f1580ca 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix
@@ -5,7 +5,7 @@
   cmake,
   curl,
   obs-studio,
-  qtbase,
+  qt6,
 }:
 
 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     curl
     obs-studio
-    qtbase
+    qt6.qtbase
   ];
 
   cmakeFlags = [
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
index f04d28bf9f66..a1d3e122a61c 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
@@ -16,8 +16,11 @@
   vulkan-headers,
   vulkan-loader,
   libGL,
-  obs-vkcapture32,
+  pkgsi686Linux,
 }:
+let
+  obs-vkcapture32 = pkgsi686Linux.obs-studio-plugins.obs-vkcapture;
+in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "obs-vkcapture";
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-wayland-hotkeys/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-wayland-hotkeys/package.nix
similarity index 97%
rename from pkgs/applications/video/obs-studio/plugins/obs-wayland-hotkeys/default.nix
rename to pkgs/applications/video/obs-studio/plugins/obs-wayland-hotkeys/package.nix
index c42e363cc7e9..d6306767d5d5 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-wayland-hotkeys/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-wayland-hotkeys/package.nix
@@ -5,7 +5,7 @@
   cmake,
   obs-studio,
   pkg-config,
-  qtbase,
+  qt6,
   nix-update-script,
 }:
 stdenv.mkDerivation (finalAttr: {
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttr: {
 
   buildInputs = [
     obs-studio
-    qtbase
+    qt6.qtbase
   ];
 
   dontWrapQtApps = true;
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix b/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix
index 8bf98ce01875..532742f3a1b0 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix
@@ -5,7 +5,7 @@
   cmake,
   asio,
   obs-studio,
-  qtbase,
+  qt6,
   websocketpp,
 }:
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     asio
     obs-studio
-    qtbase
+    qt6.qtbase
     websocketpp
   ];
 
diff --git a/pkgs/applications/video/obs-studio/plugins/waveform/default.nix b/pkgs/applications/video/obs-studio/plugins/waveform/package.nix
similarity index 100%
rename from pkgs/applications/video/obs-studio/plugins/waveform/default.nix
rename to pkgs/applications/video/obs-studio/plugins/waveform/package.nix