Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 33f91ea7b633
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 988e83bfd784
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 1, 2021

  1. 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
    @vs49688
    vs49688 committed Jan 1, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    vs49688 Zane van Iperen
    GPG key ID: 68616B2D8AC4DCC5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6a4695b View commit details

  2. Merge pull request #107632 from vs49688/fffix

    @SuperSandro2000
    SuperSandro2000 authored Jan 1, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    988e83b View commit details
Showing with 5 additions and 4 deletions.
  1. +5 −4 pkgs/development/libraries/ffmpegthumbnailer/default.nix
9 changes: 5 additions & 4 deletions pkgs/development/libraries/ffmpegthumbnailer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
};