diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/video')
5 files changed, 12 insertions, 26 deletions
diff --git a/nixpkgs/pkgs/applications/video/makemkv/default.nix b/nixpkgs/pkgs/applications/video/makemkv/default.nix index cadd3c9fc68c..a2ba36640ad5 100644 --- a/nixpkgs/pkgs/applications/video/makemkv/default.nix +++ b/nixpkgs/pkgs/applications/video/makemkv/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "makemkv-${ver}"; - ver = "1.14.1"; + ver = "1.14.3"; builder = ./builder.sh; # Using two URLs as the first one will break as soon as a new version is released @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${ver}.tar.gz" ]; - sha256 = "1n4gjb1531gkvnjzipw63v3zdxmrq5nai9nn6m2ix3lskksjrrhp"; + sha256 = "1d1b7rppbxx2b9p1smf0nlgp47j8b1z8d7q0v82kwr4qxaa0xcg0"; }; src_oss = fetchurl { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${ver}.tar.gz" ]; - sha256 = "0ysb0nm11vp2ni838p5q3gqan5nrqbr7rz0h24j8p62827pib3pw"; + sha256 = "1jgyp6qs8r0z26258mvyg9dx7qqqdqrdsziw6m24ka77zpfg4b12"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index f5cac00a5bb7..b1ff15163375 100644 --- a/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "33.0.0"; + version = "33.1.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0bphwjjpcj86phcx795wdy5b0ivwh5mvbvi5288pql88x6x0jjk9"; + sha256 = "130hh6m7cv2x9jv51qclnfg3dldxhfzhzhf6sqibfhynaj65m09i"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/video/obs-studio/default.nix b/nixpkgs/pkgs/applications/video/obs-studio/default.nix index 14e7c81aa5b8..932436bd8d3b 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/default.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/default.nix @@ -11,6 +11,7 @@ , libXdmcp , qtbase , qtx11extras +, qtsvg , speex , libv4l , x264 @@ -36,13 +37,13 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "23.0.2"; + version = "23.1.0"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; rev = "${version}"; - sha256 = "1c0a5vy4h3qwz69qw3bydyk7r651ib5a9jna4yj6c25p3p9isdvp"; + sha256 = "1iavrkjp7vgg0blm4lmj4mc4hrfx8yjaiwx55wmc5ynw80v37ybc"; }; nativeBuildInputs = [ cmake @@ -60,6 +61,7 @@ in stdenv.mkDerivation rec { libXdmcp qtbase qtx11extras + qtsvg speex x264 vlc diff --git a/nixpkgs/pkgs/applications/video/pitivi/default.nix b/nixpkgs/pkgs/applications/video/pitivi/default.nix index 6e0b7412558e..1c124df30238 100644 --- a/nixpkgs/pkgs/applications/video/pitivi/default.nix +++ b/nixpkgs/pkgs/applications/video/pitivi/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook , python3Packages, gst_all_1, gtk3 , gobject-introspection, librsvg, gnome3, libnotify, gsound -, meson, ninja +, meson, ninja, gsettings-desktop-schemas }: let @@ -49,7 +49,7 @@ in python3Packages.buildPythonApplication rec { buildInputs = [ gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound gnome3.adwaita-icon-theme - gnome3.gsettings-desktop-schemas libnotify + gsettings-desktop-schemas libnotify gst-transcoder ] ++ (with gst_all_1; [ gstreamer gst-editing-services diff --git a/nixpkgs/pkgs/applications/video/plex-media-player/default.nix b/nixpkgs/pkgs/applications/video/plex-media-player/default.nix index ceba62b6f607..20684354d095 100644 --- a/nixpkgs/pkgs/applications/video/plex-media-player/default.nix +++ b/nixpkgs/pkgs/applications/video/plex-media-player/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, makeDesktopItem, pkgconfig, cmake, python3 +{ stdenv, fetchFromGitHub, fetchurl, pkgconfig, cmake, python3 , libX11, libXrandr, qtbase, qtwebchannel, qtwebengine, qtx11extras , libvdpau, SDL2, mpv, libGL }: let @@ -50,16 +50,6 @@ in stdenv.mkDerivation rec { buildInputs = [ libX11 libXrandr qtbase qtwebchannel qtwebengine qtx11extras libvdpau SDL2 mpv libGL ]; - desktopItem = makeDesktopItem { - name = "plex-media-player"; - exec = "plexmediaplayer"; - icon = "plex-media-player"; - comment = "View your media"; - desktopName = "Plex Media Player"; - genericName = "Media Player"; - categories = "AudioVideo;Video;Player;TV;"; - }; - preConfigure = with depSrcs; '' mkdir -p build/dependencies ln -s ${webClient} build/dependencies/buildid-${webClientBuildId}.cmake @@ -69,12 +59,6 @@ in stdenv.mkDerivation rec { ln -s ${webClientTv} build/dependencies/web-client-tv-${webClientTvBuildId}.tar.xz ''; - postInstall = '' - mkdir -p $out/share/{applications,pixmaps} - cp ${src}/resources/images/icon.png $out/share/pixmaps/plex-media-player.png - cp ${desktopItem}/share/applications/* $out/share/applications - ''; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DQTROOT=${qtbase}" ]; meta = with stdenv.lib; { |