diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix index 5285d6f5abe4..68d48e71d1c7 100644 --- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix @@ -1,35 +1,36 @@ -{ lib -, fetchFromGitHub +{ + lib, + fetchFromGitHub, -, cmake -, ninja + cmake, + ninja, -, alsa-lib -, asio -, curl -, nlohmann_json -, obs-studio -, opencv -, procps -, qtbase -, stdenv -, tesseract -, websocketpp -, xorg + alsa-lib, + asio, + curl, + nlohmann_json, + obs-studio, + opencv, + procps, + qtbase, + stdenv, + tesseract, + websocketpp, + xorg, -, httplib -, libremidi + httplib, + libremidi, }: stdenv.mkDerivation rec { pname = "advanced-scene-switcher"; - version = "1.27.1"; + version = "1.27.2"; src = fetchFromGitHub { owner = "WarmUpTill"; repo = "SceneSwitcher"; rev = version; - hash = "sha256-KP3aYSGjEsytiA7toLSkqKcxgT+2Wu3SKyOG4uga2RI="; + hash = "sha256-7IciHCe2KemKNJpD9QcYK4AtxHlYuWaPsBCcVuPVvgA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix index d6341eba5342..6ac26bf599ab 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix @@ -1,26 +1,40 @@ -{ lib -, stdenv -, fetchFromGitHub -, gst_all_1 -, pkg-config -, meson -, ninja -, obs-studio +{ + lib, + stdenv, + fetchFromGitHub, + gst_all_1, + pkg-config, + meson, + ninja, + obs-studio, }: stdenv.mkDerivation rec { pname = "obs-gstreamer"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "fzwoch"; repo = pname; rev = "v${version}"; - hash = "sha256-C4yee7hzkSOjIeaacLaTGPzZ1qYdYtHK5a3m9gz2pPI="; + hash = "sha256-23LyxN1Vgol9uA7rDdfZXcmfhG4l0RfMYGbofbhObBE="; }; - nativeBuildInputs = [ pkg-config meson ninja ]; - buildInputs = with gst_all_1; [ gstreamer gst-plugins-base obs-studio ]; + postPatch = '' + substituteInPlace meson.build \ + --replace-fail "'git', 'rev-parse', '--short', 'HEAD'" "'echo', '${version}'" + ''; + + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; + buildInputs = with gst_all_1; [ + gstreamer + gst-plugins-base + obs-studio + ]; # - We need "getLib" instead of default derivation, otherwise it brings gstreamer-bin; # - without gst-plugins-base it won't even show proper errors in logs; @@ -29,9 +43,11 @@ stdenv.mkDerivation rec { # Tip: "could not link appsrc to videoconvert1" can mean a lot of things, enable GST_DEBUG=2 for help. passthru.obsWrapperArguments = let - gstreamerHook = package: "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${lib.getLib package}/lib/gstreamer-1.0"; + gstreamerHook = + package: "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${lib.getLib package}/lib/gstreamer-1.0"; in - with gst_all_1; builtins.map gstreamerHook [ + with gst_all_1; + builtins.map gstreamerHook [ gstreamer gst-plugins-base gst-plugins-bad @@ -47,7 +63,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "OBS Studio source, encoder and video filter plugin to use GStreamer elements/pipelines in OBS Studio"; homepage = "https://github.com/fzwoch/obs-gstreamer"; - maintainers = with maintainers; [ ahuzik pedrohlc ]; + maintainers = with maintainers; [ + ahuzik + pedrohlc + ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix index f58d81e9b706..a2c1300520dc 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix @@ -1,17 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, obs-studio, cmake, qtbase, ndi }: +{ + lib, + stdenv, + fetchFromGitHub, + obs-studio, + cmake, + qtbase, + ndi, + curl, +}: stdenv.mkDerivation rec { pname = "obs-ndi"; - version = "4.13.2"; + version = "4.14.1"; - nativeBuildInputs = [ cmake qtbase ]; - buildInputs = [ obs-studio qtbase ndi ]; + nativeBuildInputs = [ + cmake + qtbase + ]; + buildInputs = [ + obs-studio + qtbase + ndi + curl + ]; src = fetchFromGitHub { owner = "Palakis"; repo = "obs-ndi"; rev = version; - sha256 = "sha256-DVUoLV2jCdD8qXSpmGvqjrQh02dCLroKsUAb5+lYTog="; + sha256 = "sha256-ex/fZmZpFM6GTKNBQClzSf6Ns0Yts5+0PAmf5mIQCwc="; }; patches = [ diff --git a/pkgs/applications/video/obs-studio/plugins/obs-ndi/hardcode-ndi-path.patch b/pkgs/applications/video/obs-studio/plugins/obs-ndi/hardcode-ndi-path.patch index b675c10a0346..c8b400b682d8 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-ndi/hardcode-ndi-path.patch +++ b/pkgs/applications/video/obs-studio/plugins/obs-ndi/hardcode-ndi-path.patch @@ -11,6 +11,6 @@ index 0d94add..617af73 100644 - locations << "/usr/local/lib"; -#endif + locations << "@NDI@/lib"; - for (QString location : locations) { + for (auto location : locations) { path = QDir::cleanPath( QDir(location).absoluteFilePath(NDILIB_LIBRARY_NAME)); diff --git a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix index e73b54aac18f..dc03e00a192e 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix @@ -1,30 +1,37 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, ninja -, obs-studio -, pipewire -, pkg-config +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + obs-studio, + pipewire, + pkg-config, }: stdenv.mkDerivation rec { pname = "obs-pipewire-audio-capture"; - version = "1.1.3"; + version = "1.1.5"; src = fetchFromGitHub { owner = "dimtpap"; repo = pname; rev = version; - sha256 = "sha256-dL/+Y1uaD+7EY0UNWbxvh1TTLYfgk07qCqLLGvfzWZk="; + sha256 = "sha256-qYHU0m+jz/mQmjleITnzxNkTio5ir8dFkHKfmY4l0Es="; }; - nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = [ obs-studio pipewire ]; + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + buildInputs = [ + obs-studio + pipewire + ]; cmakeFlags = [ - "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs" - "-Wno-dev" + "-DCMAKE_INSTALL_LIBDIR=/lib" ]; meta = with lib; { @@ -32,6 +39,9 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dimtpap/obs-pipewire-audio-capture"; maintainers = with maintainers; [ Elinvention ]; license = licenses.gpl2Plus; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix index 798b23b2c8d7..78087e4ed446 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix @@ -1,58 +1,44 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch2 -, obs-studio -, cmake -, zlib -, curl -, taglib -, dbus -, pkg-config -, qtbase -, wrapQtAppsHook +{ + lib, + stdenv, + fetchFromGitHub, + obs-studio, + cmake, + zlib, + curl, + taglib, + dbus, + pkg-config, + qtbase, + wrapQtAppsHook, }: stdenv.mkDerivation (finalAttrs: { pname = "obs-tuna"; - version = "1.9.7"; + version = "1.9.9"; - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; - buildInputs = [ obs-studio qtbase zlib curl taglib dbus ]; + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; + buildInputs = [ + obs-studio + qtbase + zlib + curl + taglib + dbus + ]; src = fetchFromGitHub { owner = "univrsal"; repo = "tuna"; rev = "v${finalAttrs.version}"; - hash = "sha256-NpfQ3zi+1kQNt2Lj4+1kX2bW9A/E2/MhUV1BA1UX4y0="; + hash = "sha256-qwOAidnCGZSwTahgbyf1K0KgoDvYpqDAQXM3l1lfZXg="; fetchSubmodules = true; }; - # obs_frontend_add_dock() deprecated in obs 30 - env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - - patches = [ - # fix build with qt 6.6.0 - # treewide: replace deprecated qAsConst with std::as_const() - # https://github.com/univrsal/tuna/pull/176 - (fetchpatch2 { - url = "https://github.com/univrsal/tuna/commit/0d570e771f8d8e6ae7c85bd2b86bbf59c264789e.patch"; - hash = "sha256-A5idhMiM9funqhTm5XMIBqwy+FO1SaNPtgZjo+Vws6k="; - }) - # fix build with obs 30 - (fetchpatch2 { - url = "https://github.com/univrsal/tuna/commit/723bd3c7b4e257cf0997611426e555068de77ae7.patch"; - hash = "sha256-MF5vghGYknL6q+A8BJ1yrQcEKIu9I+PWk+RZNYg3fRU="; - }) - ]; - - postInstall = '' - mkdir $out/lib $out/share - mv $out/obs-plugins/64bit $out/lib/obs-plugins - rm -rf $out/obs-plugins - mv $out/data $out/share/obs - ''; - dontWrapQtApps = true; meta = {