From 50dbda375ae5c49d110648f154c1f5d1514640c2 Mon Sep 17 00:00:00 2001 From: John Garcia Date: Sun, 12 May 2024 22:08:35 +0100 Subject: [PATCH 1/2] ffmpegthumbnailer: refactor code with nixfmt --- .../libraries/ffmpegthumbnailer/default.nix | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index 47e3c3ed42c7..8a4d155057c8 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -1,4 +1,12 @@ -{ fetchFromGitHub, lib, stdenv, ffmpeg-headless, cmake, libpng, pkg-config, libjpeg +{ + fetchFromGitHub, + lib, + stdenv, + ffmpeg-headless, + cmake, + libpng, + pkg-config, + libjpeg, }: stdenv.mkDerivation rec { @@ -12,8 +20,17 @@ stdenv.mkDerivation rec { sha256 = "0606pbg391l4s8mpyyalm9zrcnm75fwqdlrxy2gif9n21i2fm3rc"; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ ffmpeg-headless libpng libjpeg ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + ffmpeg-headless + libpng + libjpeg + ]; + cmakeFlags = [ "-DENABLE_THUMBNAILER=ON" ]; # https://github.com/dirkvdb/ffmpegthumbnailer/issues/215 @@ -22,21 +39,20 @@ stdenv.mkDerivation rec { --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ ''; - meta = with lib; { - homepage = "https://github.com/dirkvdb/ffmpegthumbnailer"; + meta = with lib; { description = "A lightweight video thumbnailer"; - mainProgram = "ffmpegthumbnailer"; longDescription = "FFmpegthumbnailer is a lightweight video thumbnailer that can be used by file managers to create thumbnails - for your video files. The thumbnailer uses ffmpeg o decode frames + for your video files. The thumbnailer uses ffmpeg to decode frames from the video files, so supported videoformats depend on the configuration flags of ffmpeg. This thumbnailer was designed to be as fast and lightweight as possible. - The only dependencies are ffmpeg and libpng. + The only dependencies are ffmpeg and libpng/libjpeg. "; - platforms = platforms.unix; + homepage = "https://github.com/dirkvdb/ffmpegthumbnailer"; license = licenses.gpl2Plus; maintainers = [ maintainers.jagajaga ]; + platforms = platforms.unix; + mainProgram = "ffmpegthumbnailer"; }; - } From f6f7014ce43ae087c01e4dc9316c3f22d485347c Mon Sep 17 00:00:00 2001 From: John Garcia Date: Sun, 12 May 2024 22:11:49 +0100 Subject: [PATCH 2/2] ffmpegthumbnailer: unstable-2022-02-18 -> unstable-2024-01-04 --- .../libraries/ffmpegthumbnailer/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index 8a4d155057c8..c1c9fe960e7d 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -1,23 +1,23 @@ { - fetchFromGitHub, lib, stdenv, - ffmpeg-headless, + fetchFromGitHub, cmake, - libpng, pkg-config, + ffmpeg-headless, + libpng, libjpeg, }: stdenv.mkDerivation rec { pname = "ffmpegthumbnailer"; - version = "unstable-2022-02-18"; + version = "unstable-2024-01-04"; src = fetchFromGitHub { owner = "dirkvdb"; repo = "ffmpegthumbnailer"; - rev = "3db9fe895b2fa656bb40ddb7a62e27604a688171"; - sha256 = "0606pbg391l4s8mpyyalm9zrcnm75fwqdlrxy2gif9n21i2fm3rc"; + rev = "1b5a77983240bcf00a4ef7702c07bcd8f4e5f97c"; + hash = "sha256-7SPRQMPgdvP7J3HCf7F1eXxZjUH5vCYZ9UOwTUFMLp0="; }; nativeBuildInputs = [