ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 04:12:44 +03:00
Code Issues Projects Releases Wiki Activity

ffmpegthumbnailer: enable generation of thumbnailer file, misc cleanups

Browse Source 
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
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/ffmpegthumbnailer/default.nix
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,8 +12,9 @@ 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";
@ -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 ];
}; };