diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-31 18:01:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-31 18:01:02 +0000 |
| commit | 81270bbdcf37beeb451991cf5e96b57d14d38bca (patch) | |
| tree | 91c21889bf9ba5e17b1cf2901b5d5ed114d3c43f /pkgs/applications/video | |
| parent | 2fd5f8dd7ad6c3a83bc960b6ea1f6903141270ea (diff) | |
| parent | 2784272f5baa2ade2347c1e02a9665d85b85d723 (diff) | |
| download | nixpkgs-81270bbdcf37beeb451991cf5e96b57d14d38bca.tar nixpkgs-81270bbdcf37beeb451991cf5e96b57d14d38bca.tar.gz nixpkgs-81270bbdcf37beeb451991cf5e96b57d14d38bca.tar.bz2 nixpkgs-81270bbdcf37beeb451991cf5e96b57d14d38bca.tar.lz nixpkgs-81270bbdcf37beeb451991cf5e96b57d14d38bca.tar.xz nixpkgs-81270bbdcf37beeb451991cf5e96b57d14d38bca.tar.zst nixpkgs-81270bbdcf37beeb451991cf5e96b57d14d38bca.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/video')
3 files changed, 44 insertions, 2 deletions
diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 63bad0fe645..d3d1ceb2de6 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -42,6 +42,8 @@ obs-pipewire-audio-capture = callPackage ./obs-pipewire-audio-capture.nix { }; + obs-replay-source = qt6Packages.callPackage ./obs-replay-source.nix { }; + obs-rgb-levels-filter = callPackage ./obs-rgb-levels-filter.nix { }; obs-scale-to-sound = callPackage ./obs-scale-to-sound.nix { }; 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 8e227195484..ec9885fc7e7 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 @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "obs-pipewire-audio-capture"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "dimtpap"; repo = pname; rev = version; - sha256 = "sha256-D4ONz/4S5Kt23Tmfa6jvw0X7680R9YDqG8/N6HhIQLE="; + sha256 = "sha256-9HPQ17swMlsCnKkYQXIUzEbx2vKuBUfGf58Up2hHVGI="; }; nativeBuildInputs = [ cmake ninja pkg-config ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-replay-source.nix b/pkgs/applications/video/obs-studio/plugins/obs-replay-source.nix new file mode 100644 index 00000000000..994a56d4c86 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-replay-source.nix @@ -0,0 +1,40 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, libcaption +, obs-studio +, qtbase +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "obs-replay-source"; + version = "1.6.12"; + + src = fetchFromGitHub { + owner = "exeldro"; + repo = "obs-replay-source"; + rev = finalAttrs.version; + sha256 = "sha256-MzugH6r/jY5Kg7GIR8/o1BN36FenBzMnqrPUceJmbPs="; + }; + + 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" + ''; + + dontWrapQtApps = true; + + meta = with lib; { + description = "Replay source for OBS studio"; + homepage = "https://github.com/exeldro/obs-replay-source"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ pschmitt ]; + }; +}) |