diff options
Diffstat (limited to 'pkgs/applications/video')
5 files changed, 30 insertions, 33 deletions
diff --git a/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix b/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix index c08aabd25e530..0fa023a9fc940 100644 --- a/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix +++ b/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchurl +, fetchgit , pkg-config , makeWrapper , gtk3 @@ -13,13 +13,13 @@ stdenv.mkDerivation { pname = "gpu-screen-recorder-gtk"; - version = "3.2.5"; + version = "3.7.6"; - src = fetchurl { - url = "https://dec05eba.com/snapshot/gpu-screen-recorder-gtk.git.r175.cfd18af.tar.gz"; - hash = "sha256-HhZe22Hm9yGoy5WoyuP2+Wj8E3nMs4uf96mzmP6CMqU="; + src = fetchgit { + url = "https://repo.dec05eba.com/gpu-screen-recorder-gtk"; + rev = "cd777c1506e20514df4b97345e480051cbaf9693"; + hash = "sha256-ZBYYsW75tq8TaZp0F4v7YIHKHk/DFBIGy3X781ho2oE="; }; - sourceRoot = "."; nativeBuildInputs = [ pkg-config @@ -46,12 +46,12 @@ stdenv.mkDerivation { gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]}:/run/opengl-driver/lib) ''; - meta = with lib; { - description = "GTK frontend for gpu-screen-recorder"; + meta = { + description = "GTK frontend for gpu-screen-recorder."; mainProgram = "gpu-screen-recorder-gtk"; homepage = "https://git.dec05eba.com/gpu-screen-recorder-gtk/about/"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ babbaj ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ babbaj ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index efeff6350cdd1..6ea0ca5c9b5d5 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.0.7"; + version = "7.0.8"; src = fetchFromGitHub { owner = "anxdpanic"; repo = "plugin.video.youtube"; rev = "v${version}"; - hash = "sha256-i21BCkW4WpnQY1j9Wyn3/26GaAjWNXDb+lOVpmXlNKM="; + hash = "sha256-cWqAHC3UYDWk0cL/to9kCdH+SSN3ra+Ni6HTwposNkg="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/memento/default.nix b/pkgs/applications/video/memento/default.nix index 40ff061a7fea2..0c993de2fcaba 100644 --- a/pkgs/applications/video/memento/default.nix +++ b/pkgs/applications/video/memento/default.nix @@ -2,8 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, qtbase -, qtx11extras ? null # qt5 only +, qt6 , wrapQtAppsHook # before that => zeal @@ -15,20 +14,15 @@ , yt-dlp # optional , makeWrapper}: - -let - isQt5 = lib.versions.major qtbase.version == "5"; - -in stdenv.mkDerivation (finalAttrs: { pname = "memento"; - version = "1.2.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "ripose-jp"; repo = "Memento"; rev = "v${finalAttrs.version}"; - hash = "sha256-55VvT7pHN0/HqxM4vMDQDgUwkVmO/8aOEOye8jcFzgI="; + hash = "sha256-/lgjzR2KwlIUMHSz3afBQEy+8kdKAI37kqTuq3r3qMk="; }; nativeBuildInputs = [ @@ -38,14 +32,16 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - qtbase + qt6.qtbase + qt6.qtsvg + qt6.qtwayland sqlite json_c libzip mecab - ] ++ lib.optionals isQt5 [ qtx11extras ]; + ]; - propagatedBuildInputs = [ mpv ]; + propagatedBuildInputs = [ mpv ]; preFixup = '' wrapProgram "$out/bin/memento" \ diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index bba0377185963..8aaa0cf1448a3 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -8,7 +8,6 @@ , cmark , docbook_xsl , expat -, fetchpatch2 , file , flac , fmt @@ -50,13 +49,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "84.0"; + version = "85.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - hash = "sha256-//I++WWnSHnkpTZ0TzS3lhH5+eDD5mazTQ1HVMQS4Ug="; + hash = "sha256-E8fULDUkEnh/0W/OIh+peO+JXSecgINPJclOTc5KYVo="; }; nativeBuildInputs = [ @@ -95,11 +94,6 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ qtwayland ] ++ optionals stdenv.isDarwin [ libiconv ]; - patches = [ (fetchpatch2 { - url = "https://gitlab.com/mbunkus/mkvtoolnix/-/commit/7e1bea9527616ab6ab38425e7290579f05dd9bb1.patch"; - hash = "sha256-9UZrfwrzfKwF8XDzqYnuaDgZws7l1YAb5O1O1+nxo0g="; - }) ]; - # autoupdate is not needed but it silences a ton of pointless warnings postPatch = '' patchShebangs . > /dev/null diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index e059412e17fa1..cf88fd3b18c3f 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -61,10 +61,17 @@ stdenv.mkDerivation (finalAttrs: { --replace "libvulkan.so.1" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1" ''; - # Support 32bit Vulkan applications by linking in the 32bit Vulkan layer + # Support 32bit Vulkan applications by linking in the 32bit Vulkan layer and + # the wrapper executables. Note that vkcapture and glcapture are themselves + # wrapper scripts that simply exec gamecapture and print a warning but because + # they take gamecapture from PATH, we must link them to the 32 bit gamecapture + # directly. postInstall = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' ln -s ${obs-vkcapture32}/share/vulkan/implicit_layer.d/obs_vkcapture_32.json \ "$out/share/vulkan/implicit_layer.d/" + for bin in ${obs-vkcapture32}/bin/* ; do + ln -s ${obs-vkcapture32}/bin/obs-gamecapture "$out/bin/$(basename "$bin")32" + done ''; meta = with lib; { |