obs-studio-plugins: Prepare for transition to packagesFromDirectoryRecursive

Mostly just some mechanical find-and-replace with the following
commands(run from the `plugins/` directory:

```sh
  # qtbase -> qt6.qtbase
  find ./ -type f -exec sed -i -e 's/qtbase,/qt6,/g' {} \;
  find ./ -type f -exec sed -i -e 's/qtbase/qt6.qtbase/g' {} \;
  # <package>/default.nix -> <package>/package.nix, as required by
packagesFromDirectoryRecursive
  find ./ -name 'default.nix' -exec bash -c 'mv $0 ${0/default/package}'
{} \;
  # Rename since ez solution
  mv ./package.nix ./default.nix
```

You'll also need to remove `wrapQtAppsHook` from obs-tuna and use
`qt6.wrapQtAppsHook` instead.(I did this manually.) There's also the
change in obs-vkcapture.nix which I hope is self-explanatory, and is
gated behind x86_64-linux so doesn't impact other platforms
This commit is contained in:
dish
2026-06-26 13:51:51 -04:00
parent 206030235f
commit 8cb17c8015
22 changed files with 36 additions and 34 deletions

View File

@@ -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

View File

@@ -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
];

View File

@@ -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

View File

@@ -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;

View File

@@ -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 = ''

View File

@@ -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 = ''

View File

@@ -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;

View File

@@ -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;

View File

@@ -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 = [

View File

@@ -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 = [

View File

@@ -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;

View File

@@ -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

View File

@@ -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 = [

View File

@@ -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";

View File

@@ -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;

View File

@@ -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
];