diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-11-16 09:49:24 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-11-16 09:49:24 +0100 |
| commit | 0fe5300699182cd6e2d6f6e2459671e6d5ffd69b (patch) | |
| tree | 5e3fca0a82505733a631130889fe9756c5e8b5e5 /pkgs/applications/video | |
| parent | 1181aa74bcba03558eb18db93823a70305ddc56d (diff) | |
| parent | 826934df9a5935635740a31afec804d0369c5a66 (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/video')
3 files changed, 6 insertions, 6 deletions
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 ec9885fc7e7c8..622ba7d66e289 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 @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = " Audio device and application capture for OBS Studio using PipeWire "; + description = "Audio device and application capture for OBS Studio using PipeWire"; homepage = "https://github.com/dimtpap/obs-pipewire-audio-capture"; maintainers = with maintainers; [ Elinvention ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix index 48ee9ee639497..9b7ec4090dd55 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "obs-vaapi"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "fzwoch"; repo = pname; rev = version; - hash = "sha256-AbSI6HBdOEI54bUVqqF+b4LcCyzW30XlS9SXX2ajkas="; + hash = "sha256-PpGNLIOz+fCpcP/nvjcJ+1fkduxjcbZjb7yx8TUO25s="; }; nativeBuildInputs = [ pkg-config meson ninja ]; diff --git a/pkgs/applications/video/ustreamer/default.nix b/pkgs/applications/video/ustreamer/default.nix index 777a1ce0c7f19..04c1296b0e34c 100644 --- a/pkgs/applications/video/ustreamer/default.nix +++ b/pkgs/applications/video/ustreamer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ustreamer"; - version = "5.42"; + version = "5.45"; src = fetchFromGitHub { owner = "pikvm"; repo = "ustreamer"; rev = "v${version}"; - hash = "sha256-V4ScXzZwh3fWCWmeGeb1hce+INYBmf3wtemwNch5FjY="; + hash = "sha256-2WJXOv15oZRk2doecd+xOURygbX4oGyeMAJiiuiRBi4="; }; buildInputs = [ libbsd libevent libjpeg ]; |