tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

Merge pull request #30199 from fread2281/ffmpeg-jpeg

ffmpegthumbnailer: build with jpeg support

authored by Jörg Thalheim and committed by GitHub da55ff26 8f8a7f34

+2 -2
unified split
+2 -2
pkgs/development/libraries/ffmpegthumbnailer/default.nix
··· 1 - { pkgs, fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig 2 }: 3 4 stdenv.mkDerivation rec { ··· 13 }; 14 15 nativeBuildInputs = [ cmake pkgconfig ]; 16 - buildInputs = [ ffmpeg libpng ]; 17 18 meta = with stdenv.lib; { 19 homepage = https://github.com/dirkvdb/ffmpegthumbnailer;
··· 1 + { pkgs, fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig, libjpeg 2 }: 3 4 stdenv.mkDerivation rec { ··· 13 }; 14 15 nativeBuildInputs = [ cmake pkgconfig ]; 16 + buildInputs = [ ffmpeg libpng libjpeg ]; 17 18 meta = with stdenv.lib; { 19 homepage = https://github.com/dirkvdb/ffmpegthumbnailer;