diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/video/obs-studio/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/video/obs-studio/default.nix | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/nixpkgs/pkgs/applications/video/obs-studio/default.nix b/nixpkgs/pkgs/applications/video/obs-studio/default.nix index 29bb90a9dd8d..fee1addf0e6d 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/default.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/default.nix @@ -53,6 +53,7 @@ , libdatachannel , libvpl , qrcodegencpp +, nix-update-script }: let @@ -61,13 +62,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "obs-studio"; - version = "30.0.2"; + version = "30.1.0"; src = fetchFromGitHub { owner = "obsproject"; repo = finalAttrs.pname; rev = finalAttrs.version; - sha256 = "sha256-8pX1kqibrtDIaE1+/Pey1A5bu6MwFTXLrBOah4rsF+4="; + sha256 = "sha256-9rf3UGazEL5Obd6tqDwM5LOC6D1X6HNzs5sn5z1tOCA="; fetchSubmodules = true; }; @@ -76,25 +77,6 @@ stdenv.mkDerivation (finalAttrs: { ./Enable-file-access-and-universal-access-for-file-URL.patch ./fix-nix-plugin-path.patch - # Backport ffmpeg 6.1 / GCC 13 build fixes - # FIXME: remove in next release - (fetchpatch { - url = "https://github.com/obsproject/obs-studio/commit/cd784644f5e82b9988043f229c19603289c6d32c.patch"; - hash = "sha256-S4JE5kgr4x3uMHY2GRh0GBJpb7o/wYZb/v0CDITFNnQ="; - }) - (fetchpatch { - url = "https://github.com/obsproject/obs-studio/commit/758b47d4ed9a25b8d64ad481d8d039990b9e57c9.patch"; - hash = "sha256-jYpjwhx6e+dhN3kzbd6FcdjQ+WhIX0/BOu9PSkt+2yI="; - }) - (fetchpatch { - url = "https://github.com/obsproject/obs-studio/commit/4b5be75c7e4b8cee908ed4a02fe0078285b4e8c9.patch"; - hash = "sha256-tuOevhyxchwG42ilrplbiWoiDAKaY4HgzShlvp4VSQI="; - }) - (fetchpatch { - url = "https://github.com/obsproject/obs-studio/commit/6e080a68067b27fe5463f0f4eee7df690451f3d7.patch"; - hash = "sha256-nbn/q3uszoHaDvaW8Et1MS1sgQzMsJRmjGSMHzUxV70="; - }) - # Fix libobs.pc for plugins on non-x86 systems (fetchpatch { name = "fix-arm64-cmake.patch"; @@ -175,6 +157,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ENABLE_PIPEWIRE" pipewireSupport) ]; + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=sign-compare" # https://github.com/obsproject/obs-studio/issues/10200 + ]; + dontWrapGApps = true; preFixup = let wrapperLibraries = [ @@ -202,6 +188,8 @@ stdenv.mkDerivation (finalAttrs: { ln -s ${libcef}/lib/* $out/lib/obs-plugins/ ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Free and open source software for video recording and live streaming"; longDescription = '' |