From 4ce3a2d2f29e270a069162fd474e551fcb8dc1c9 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Sat, 26 Dec 2020 23:57:43 +1000 Subject: [PATCH] ffmpegthumbnailer: enable generation of thumbnailer file, misc cleanups Passing "-DENABLE_THUMBNAILER=ON" to CMake causes it to install "ffmpegthumbnailer.thumbnailer" into /share/thumbnailers, making it actually usable with desktop environments. Cleanups: - remove trailing whitespace - change pkgconfig -> pkg-config - change license from gpl2 to gpl2Plus (cherry picked from commit 6a4695b758e3d9e680a32e4da7815a7a3198dd77) --- pkgs/development/libraries/ffmpegthumbnailer/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index 4e3c10e8829d2a..6c8e689840e8b2 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, ffmpeg_3, cmake, libpng, pkgconfig, libjpeg +{ fetchFromGitHub, stdenv, ffmpeg_3, cmake, libpng, pkg-config, libjpeg }: stdenv.mkDerivation rec { @@ -12,13 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1bakbr714j7yxdal1f5iq0gcl4cxggbbgj227ihdh5kvygqlwich"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ ffmpeg_3 libpng libjpeg ]; + cmakeFlags = [ "-DENABLE_THUMBNAILER=ON" ]; meta = with stdenv.lib; { homepage = "https://github.com/dirkvdb/ffmpegthumbnailer"; description = "A lightweight video thumbnailer"; - longDescription = "FFmpegthumbnailer is a lightweight video + 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 from the video files, so supported videoformats depend on the @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { The only dependencies are ffmpeg and libpng. "; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.jagajaga ]; };