diff --git a/pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch b/pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch index 49d01bacbd10..b0c9650ddb90 100644 --- a/pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch +++ b/pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch @@ -12,12 +12,12 @@ security model. 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/obs-browser-source.cpp b/obs-browser-source.cpp -index ab1181e..c775283 100644 +index 09b3017..1094340 100644 --- a/plugins/obs-browser/obs-browser-source.cpp +++ b/plugins/obs-browser/obs-browser-source.cpp -@@ -179,9 +179,12 @@ bool BrowserSource::CreateBrowser() +@@ -239,9 +239,12 @@ bool BrowserSource::CreateBrowser() - #if ENABLE_LOCAL_FILE_URL_SCHEME + #if ENABLE_LOCAL_FILE_URL_SCHEME && CHROME_VERSION_BUILD < 4430 if (is_local) { - /* Disable web security for file:// URLs to allow - * local content access to remote APIs */ @@ -30,7 +30,4 @@ index ab1181e..c775283 100644 + STATE_ENABLED; } #endif - --- -2.31.1 - + auto browser = CefBrowserHost::CreateBrowserSync( diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index d787ab91db1e..5a95f746ee2e 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -1,6 +1,8 @@ { config +, uthash , lib , stdenv +, nv-codec-headers-12 , fetchFromGitHub , fetchpatch , addOpenGLRunpath @@ -39,7 +41,6 @@ , withFdk ? true , pipewire , libdrm -, libajantv2 , librist , libva , srt @@ -62,13 +63,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "obs-studio"; - version = "30.1.2"; + version = "30.2.0"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = finalAttrs.version; - hash = "sha256-M4IINBoYrgkM37ykb4boHyWP8AxwMX0b7IAeeNIw9Qo="; + hash = "sha256-mwh2KLSz+I/8f3i/wST/2vKL/hWTCTaq53sinIEX75M="; fetchSubmodules = true; }; @@ -113,7 +114,6 @@ stdenv.mkDerivation (finalAttrs: { libvlc mbedtls pciutils - libajantv2 librist libva srt @@ -124,6 +124,8 @@ stdenv.mkDerivation (finalAttrs: { libdatachannel libvpl qrcodegencpp + uthash + nv-codec-headers-12 ] ++ optionals scriptingSupport [ luajit python3 ] ++ optional alsaSupport alsa-lib @@ -155,6 +157,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ENABLE_ALSA" alsaSupport) (lib.cmakeBool "ENABLE_PULSEAUDIO" pulseaudioSupport) (lib.cmakeBool "ENABLE_PIPEWIRE" pipewireSupport) + (lib.cmakeBool "ENABLE_AJA" false) # TODO: fix linking against libajantv2 ]; env.NIX_CFLAGS_COMPILE = toString [ diff --git a/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch b/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch index baf45104e6a8..13569e8499b5 100644 --- a/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch +++ b/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch @@ -1,9 +1,9 @@ diff --git a/cmake/Modules/ObsDefaults_Linux.cmake b/cmake/Modules/ObsDefaults_Linux.cmake -index d1e58a083..a03c6b98e 100644 +index fe8d72364..1c590fcdb 100644 --- a/cmake/Modules/ObsDefaults_Linux.cmake +++ b/cmake/Modules/ObsDefaults_Linux.cmake @@ -76,7 +76,7 @@ macro(setup_obs_project) - set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/") + set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") set(OBS_DATA_PATH "${OBS_DATA_DESTINATION}") - set(OBS_SCRIPT_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${OBS_SCRIPT_PLUGIN_DESTINATION}") @@ -12,15 +12,15 @@ index d1e58a083..a03c6b98e 100644 else() set(OBS_EXECUTABLE_DESTINATION "bin/${_ARCH_SUFFIX}bit") diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c -index b006a5598..531655eb3 100644 +index 77c36be5e..fe8a04813 100644 --- a/libobs/obs-nix.c +++ b/libobs/obs-nix.c -@@ -56,7 +56,7 @@ const char *get_module_extension(void) - #define FLATPAK_PLUGIN_PATH "/app/plugins" +@@ -51,7 +51,7 @@ const char *get_module_extension(void) static const char *module_bin[] = { + "../../obs-plugins/64bit", - OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION, + OBS_PLUGIN_DESTINATION, - "../../obs-plugins/" BIT_STRING, FLATPAK_PLUGIN_PATH "/" OBS_PLUGIN_DESTINATION, }; +