mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 09:23:01 +00:00
e8e0255162
* obs-studio: tidy things up a little
* obs-studio: add plugin wrapper
This allows users to install plugins into their OBS Studio, like so:
wrapOBS {
plugins = with obs-studio-plugins; [
wlrobs
obs-multi-rtmp
obs-gstreamer
];
}
* obs-gstreamer: convert to plugin
* obs-move-transition: convert to plugin
* obs-multi-rtmp: convert to plugin
* obs-ndi: convert to plugin
* obs-v4l2sink: remove
The functionality provided by this package is included in the upstream
project as of version 26.1.
Link: https://github.com/CatxFish/obs-v4l2sink/issues/56#issuecomment-753191690
Link: https://github.com/obsproject/obs-studio/releases/tag/26.1.0
* wlrobs: convert to plugin, unstable-2020-06-22 -> unstable-2021-05-13
18 lines
534 B
Diff
18 lines
534 B
Diff
diff --git a/src/obs-ndi.cpp b/src/obs-ndi.cpp
|
|
index 493831c..7b0f8db 100644
|
|
--- a/src/obs-ndi.cpp
|
|
+++ b/src/obs-ndi.cpp
|
|
@@ -197,11 +197,7 @@ const char* obs_module_description()
|
|
const NDIlib_v4* load_ndilib()
|
|
{
|
|
QStringList locations;
|
|
- locations << QString(qgetenv(NDILIB_REDIST_FOLDER));
|
|
-#if defined(__linux__) || defined(__APPLE__)
|
|
- locations << "/usr/lib";
|
|
- locations << "/usr/local/lib";
|
|
-#endif
|
|
+ locations << "@NDI@/lib";
|
|
|
|
for (QString path : locations) {
|
|
blog(LOG_INFO, "Trying '%s'", path.toUtf8().constData());
|