feat: update OBS Studio to 30.1.0-beta1

pkgs/default.nix

@@ -4,6 +4,7 @@
 { pkgs ? (import ../nixpkgs.nix) { } }: {
   distrobox = pkgs.callPackage ./distrobox { };
   gitkraken = pkgs.callPackage ./gitkraken { };
+  libdatachannel = pkgs.callPackage ./libdatachannel { };
   lima-bin = pkgs.callPackage ./lima-bin { };
   obs-studio = pkgs.callPackage ./obs-studio { };
   obs-studio-plugins = pkgs.callPackage ./obs-studio/plugins { };

pkgs/libdatachannel/default.nix

@@ -0,0 +1,61 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, srcOnly
+, cmake
+, ninja
+, pkg-config
+, libnice
+, openssl
+, plog
+, srtp
+, usrsctp
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libdatachannel";
+  version = "0.20.1";
+
+  src = fetchFromGitHub {
+    owner = "paullouisageneau";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-0PBtQkcC/PQ8MTKN5HOSVGOp0EhvyhX7OCjcmsRW+KA=";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  strictDeps = true;
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+  ];
+  buildInputs = [
+    libnice
+    openssl
+    srtp
+    usrsctp
+    plog
+  ];
+
+  cmakeFlags = [
+    "-DUSE_NICE=ON"
+    "-DPREFER_SYSTEM_LIB=ON"
+    "-DNO_EXAMPLES=ON"
+  ];
+
+  postFixup = ''
+    # Fix include path that will be incorrect due to the "dev" output
+    substituteInPlace "$dev/lib/cmake/LibDataChannel/LibDataChannelTargets.cmake" \
+      --replace "\''${_IMPORT_PREFIX}/include" "$dev/include"
+  '';
+
+  meta = with lib; {
+    description = "C/C++ WebRTC network library featuring Data Channels, Media Transport, and WebSockets";
+    homepage = "https://libdatachannel.org/";
+    license = with licenses; [ mpl20 ];
+    maintainers = with maintainers; [ erdnaxe ];
+    platforms = platforms.linux;
+  };
+}

pkgs/obs-studio/default.nix

@@ -53,19 +53,20 @@
 let
   inherit (lib) optional optionals;
   libcef = pkgs.callPackage ../libcef { };
+  libdatachannel = pkgs.callPackage ../libdatachannel { };
   libvpl = pkgs.callPackage ../libvpl { };
   qrcodegencpp = pkgs.callPackage ../qrcodegencpp { };
 in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "obs-studio";
-  version = "30.0.2";
+  version = "30.1.0-beta1";
 
   src = fetchFromGitHub {
     owner = "obsproject";
     repo = finalAttrs.pname;
     rev = finalAttrs.version;
-    sha256 = "sha256-8pX1kqibrtDIaE1+/Pey1A5bu6MwFTXLrBOah4rsF+4=";
+    sha256 = "sha256-mTzQBr3tuacibRvrlyXIA0zGmJepVmqgcr5d40fHSxM=";
     fetchSubmodules = true;
   };
 
@@ -145,6 +146,8 @@ stdenv.mkDerivation (finalAttrs: {
     "-DENABLE_LIBFDK=ON"
   ];
 
+  NIX_CFLAGS_COMPILE = [ "-Wno-error=sign-compare" ];
+
   dontWrapGApps = true;
   preFixup = let
     wrapperLibraries = [

pkgs/obs-studio/plugins/default.nix

@@ -64,6 +64,8 @@
 
   obs-replay-source = qt6Packages.callPackage ./obs-replay-source.nix { };
 
+  obs-retro-effects = callPackage ./obs-retro-effects.nix { };
+
   obs-rgb-levels = callPackage ./obs-rgb-levels.nix { };
 
   obs-scale-to-sound = callPackage ./obs-scale-to-sound.nix { };

pkgs/obs-studio/plugins/obs-advanced-masks.nix

@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "obs-advanced-masks";
-  version = "v1.0.1";
+  version = "v1.1.0";
 
   src = fetchFromGitHub {
     owner = "FiniteSingularity";
     repo = "obs-advanced-masks";
     rev = version;
-    sha256 = "sha256-ybVbrj/y5Z/PD6a77m6RlMUuQ6V9A4wGeb1LKmRFz4Q=";
+    sha256 = "sha256-NtmOWKk3eZeRa3TvclZpg4sj8lbOoY8hUhxs1z6kEW4=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/obs-studio/plugins/obs-localvocal.nix

@@ -8,13 +8,14 @@
 }:
 stdenv.mkDerivation rec {
   pname = "obs-localvocal";
-  version = "0.0.8";
+  version = "0.1.0";
 
+  # FTBFS because it wants to clone git repos during the build
   src = fetchFromGitHub {
     owner = "occ-ai";
     repo = "obs-localvocal";
     rev = version;
-    sha256 = "sha256-pZnWPXrG3sWg8Wv/ZA0LxH8p+VWAlJRSfTVn7dm4X8I=";
+    sha256 = "sha256-/czUGvMOuf4Xk6uho0Ev1KDaLHRxckdx245+wWN4MgA=";
     fetchSubmodules = true;
   };
 

pkgs/obs-studio/plugins/obs-pipewire-audio-capture.nix

@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "obs-pipewire-audio-capture";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "dimtpap";
     repo = pname;
     rev = version;
-    sha256 = "sha256-9HPQ17swMlsCnKkYQXIUzEbx2vKuBUfGf58Up2hHVGI=";
+    sha256 = "sha256-dL/+Y1uaD+7EY0UNWbxvh1TTLYfgk07qCqLLGvfzWZk=";
   };
 
   nativeBuildInputs = [ cmake ninja pkg-config ];

pkgs/obs-studio/plugins/obs-replay-source.nix

@@ -9,23 +9,22 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "obs-replay-source";
-  version = "1.6.13";
+  version = "1.7.0";
+
 
   src = fetchFromGitHub {
     owner = "exeldro";
     repo = "obs-replay-source";
-    rev = finalAttrs.version;
-    sha256 = "sha256-i64rpIVnUplA9AKZtR3xeByeawca7B00kGmEcKi7DWQ=";
+    #rev = finalAttrs.version;
+    rev =  "6590fde1c8e4f8c733016646a8165d52e28d094b";
+    sha256 = "sha256-foIzWNlU72FWXZVWR8TEiqJJMfl1vWYDTyhV6thYJbA=";
   };
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ libcaption obs-studio qtbase ];
 
   postInstall = ''
-    mkdir -p "$out/lib" "$out/share"
-    mv "$out/obs-plugins/64bit" "$out/lib/obs-plugins"
-    rm -rf "$out/obs-plugins"
-    mv "$out/data" "$out/share/obs"
+    rm -rf $out/obs-plugins $out/data
   '';
 
   dontWrapQtApps = true;

pkgs/obs-studio/plugins/obs-retro-effects.nix

@@ -0,0 +1,35 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, obs-studio
+}:
+
+stdenv.mkDerivation rec {
+  pname = "obs-retro-effects";
+  version = "0.0.2a";
+
+  src = fetchFromGitHub {
+    owner = "FiniteSingularity";
+    repo = "obs-retro-effects";
+    rev = "${version}";
+    sha256 = "sha256-EPzfCKL4JQiRaHyJJw0HNqfhHiYd/v2705R+j5H/Oow=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ obs-studio ];
+
+  postFixup = ''
+    mv $out/data/obs-plugins/${pname}/shaders $out/share/obs/obs-plugins/${pname}/
+    rm -rf $out/obs-plugins
+    rm -rf $out/data
+  '';
+
+  meta = with lib; {
+    description = "A collection of OBS filters to give your stream that retro feel.";
+    homepage = "https://github.com/FiniteSingularity/obs-retro-effects";
+    maintainers = with maintainers; [ flexiondotorg ];
+    license = licenses.gpl2Plus;
+    platforms = [ "x86_64-linux" "i686-linux" ];
+  };
+}