obs-studio: 30.2.3 -> 31.0.0

NixOS · Dec 29, 2024 · 722b599 · 722b599
1 parent 685a9fc
commit 722b599
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 38 deletions.
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
@@ -64,13 +64,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "obs-studio";
-  version = "30.2.3";
+  version = "31.0.0";
 
   src = fetchFromGitHub {
     owner = "obsproject";
     repo = "obs-studio";
     rev = finalAttrs.version;
-    hash = "sha256-4bAzW62xX9apKOAJyn3iys1bFdHj4re2reMZtlGsn5s=";
+    hash = "sha256-KJ92oCgtj7Ns+/9d7qpzO0brSXe9hseuYN9/nrFo9mQ=";
     fetchSubmodules = true;
   };
 
@@ -80,29 +80,6 @@ stdenv.mkDerivation (finalAttrs: {
     # Lets obs-browser build against CEF 90.1.0+
     ./Enable-file-access-and-universal-access-for-file-URL.patch
     ./fix-nix-plugin-path.patch
-
-    # Fix libobs.pc for plugins on non-x86 systems
-    (fetchpatch {
-      name = "fix-arm64-cmake.patch";
-      url = "https://git.alpinelinux.org/aports/plain/community/obs-studio/broken-config.patch?id=a92887564dcc65e07b6be8a6224fda730259ae2b";
-      hash = "sha256-yRSw4VWDwMwysDB3Hw/tsmTjEQUhipvrVRQcZkbtuoI=";
-      includes = [ "*/CompilerConfig.cmake" ];
-    })
-
-    (fetchpatch {
-      name = "qt-6.8.patch";
-      url = "https://github.com/obsproject/obs-websocket/commit/d9befb9e0a4898695eef5ccbc91a4fac02027854.patch";
-      extraPrefix = "plugins/obs-websocket/";
-      stripLen = 1;
-      hash = "sha256-7SDBRr9G40b9DfbgdaYJxTeiDSLUfVixtMtM3cLTVZs=";
-    })
-
-    # Fix lossless audio, ffmpeg 7,1 compatibility issue
-    (fetchpatch {
-      name = "fix-lossless-audio.patch";
-      url = "https://github.com/obsproject/obs-studio/commit/dfc3a69c5276edf84c933035ff2a7e278fa13c9a.patch";
-      hash = "sha256-wiF3nolBpZKp7LR7NloNfJ+v4Uq/nBgwCVoKZX+VEMA=";
-    })
   ];
 
   nativeBuildInputs = [

diff --git a/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch b/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch
@@ -1,16 +1,3 @@
-diff --git a/cmake/Modules/ObsDefaults_Linux.cmake b/cmake/Modules/ObsDefaults_Linux.cmake
-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_DATA_PATH "${OBS_DATA_DESTINATION}")
-
--    set(OBS_SCRIPT_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${OBS_SCRIPT_PLUGIN_DESTINATION}")
-+    set(OBS_SCRIPT_PLUGIN_PATH "${OBS_SCRIPT_PLUGIN_DESTINATION}")
-     set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OBS_LIBRARY_DESTINATION}")
-   else()
-     set(OBS_EXECUTABLE_DESTINATION "bin/${_ARCH_SUFFIX}bit")
 diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c
 index 77c36be5e..fe8a04813 100644
 --- a/libobs/obs-nix.c