From b16ae23afd789e01760983bbda32d774b74e3c01 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Wed, 30 Oct 2024 19:49:52 +0100 Subject: [PATCH] qctools: revert ffmpeg version to 6 Regression caused by #337855 --- pkgs/applications/video/qctools/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/qctools/default.nix b/pkgs/applications/video/qctools/default.nix index cbe565fe73c8..4f19af793880 100644 --- a/pkgs/applications/video/qctools/default.nix +++ b/pkgs/applications/video/qctools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qmake, wrapQtAppsHook, ffmpeg, qtmultimedia, qwt }: +{ lib, stdenv, fetchurl, qmake, wrapQtAppsHook, ffmpeg_6, qtmultimedia, qwt }: stdenv.mkDerivation rec { pname = "qctools"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake wrapQtAppsHook ]; - buildInputs = [ ffmpeg qtmultimedia qwt ]; + buildInputs = [ ffmpeg_6 qtmultimedia qwt ]; installPhase = '' runHook preInstall @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Audiovisual analytics and filtering of video files"; homepage = "https://mediaarea.net/QCTools"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ orivej ]; + platforms = lib.platforms.linux; }; }