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
This commit is contained in:
Zane van Iperen 2020-12-26 23:57:43 +10:00
parent 5ea718cb2d
commit 6a4695b758
No known key found for this signature in database
GPG Key ID: 68616B2D8AC4DCC5

View File

@ -1,4 +1,4 @@
{ fetchFromGitHub, stdenv, ffmpeg_3, cmake, libpng, pkgconfig, libjpeg { fetchFromGitHub, stdenv, ffmpeg_3, cmake, libpng, pkg-config, libjpeg
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,13 +12,14 @@ stdenv.mkDerivation rec {
sha256 = "1bakbr714j7yxdal1f5iq0gcl4cxggbbgj227ihdh5kvygqlwich"; sha256 = "1bakbr714j7yxdal1f5iq0gcl4cxggbbgj227ihdh5kvygqlwich";
}; };
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ ffmpeg_3 libpng libjpeg ]; buildInputs = [ ffmpeg_3 libpng libjpeg ];
cmakeFlags = [ "-DENABLE_THUMBNAILER=ON" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://github.com/dirkvdb/ffmpegthumbnailer"; homepage = "https://github.com/dirkvdb/ffmpegthumbnailer";
description = "A lightweight video thumbnailer"; 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 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 o decode frames
from the video files, so supported videoformats depend on the from the video files, so supported videoformats depend on the
@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
The only dependencies are ffmpeg and libpng. The only dependencies are ffmpeg and libpng.
"; ";
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.gpl2; license = licenses.gpl2Plus;
maintainers = [ maintainers.jagajaga ]; maintainers = [ maintainers.jagajaga ];
}; };