diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-07 00:02:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-07 00:02:25 +0000 |
| commit | 0789ea69b14bc308940691b0a6eb878d737c90c0 (patch) | |
| tree | d136e6f552a5c40f3316bcca7c6d6ae67bde667b /pkgs/applications/video | |
| parent | 5b308cd1df5b405ce6c5630454fdb1733e3f8a58 (diff) | |
| parent | 3ad7b8a7e8c2da367d661df6c3742168c53913fa (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/mkvtoolnix/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/video/natron/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 779f8bf3bf7e7..bce50b43a07c4 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "72.0.0"; + version = "73.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "sha256-3XKvcV6vwXrn2mf8ziclKgEPOwn3IPyLYy6+d0DscHs="; + sha256 = "HGoT3t/ooRMiyjUkHnvVGOB04IU5U8VEKDixhE57kR8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 82eaa30bba3ec..b41503b73597c 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, qt4, pkg-config, boost, expat, cairo, python2Packages, cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip, - poppler, imagemagick, openexr, ffmpeg, opencolorio_1, openimageio, + poppler, imagemagick, openexr, ffmpeg, opencolorio_1, openimageio_1, qmake4Hook, libpng, libGL, lndir, libraw, openjpeg, libwebp, fetchFromGitHub }: let @@ -74,7 +74,7 @@ let sha256 = "OQg6a5wNy9TFFySjmgd1subvXRxY/ZnSOCkaoUo+ZaA="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libpng ffmpeg openexr opencolorio_1 openimageio boost libGL + libpng ffmpeg openexr opencolorio_1 openimageio_1 boost libGL seexpr libraw openjpeg libwebp ]; }) |