public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #120782 from AluisioASG/aasg/delete-ffmpeg_3

Browse Source 
python3Packages.ffmpeg-python: replace ffmpeg_3 with ffmpeg
This commit is contained in:
Sandro 2021-04-27 13:50:52 +02:00 committed by GitHub
commit 504194e256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/python-modules/ffmpeg-python/default.nix
View File

@ -2,9 +2,9 @@
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, substituteAll , substituteAll
, ffmpeg_3 , pytestCheckHook
, ffmpeg
, future , future
, pytest
, pytestrunner , pytestrunner
, pytest-mock , pytest-mock
}: }:
@ -21,23 +21,20 @@ buildPythonPackage rec {
}; };
patches = [ patches = [
( (substituteAll {
substituteAll { src = ./ffmpeg-location.patch;
src = ./ffmpeg-location.patch; inherit ffmpeg;
ffmpeg = ffmpeg_3; })
}
)
]; ];
buildInputs = [ pytestrunner ]; buildInputs = [ pytestrunner ];
propagatedBuildInputs = [ future ]; propagatedBuildInputs = [ future ];
checkInputs = [ pytest pytest-mock ]; checkInputs = [ pytestCheckHook pytest-mock ];
meta = with lib; { meta = with lib; {
description = "Python bindings for FFmpeg - with complex filtering support"; description = "Python bindings for FFmpeg - with complex filtering support";
homepage = "https://github.com/kkroening/ffmpeg-python"; homepage = "https://github.com/kkroening/ffmpeg-python";
license = licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.AluisioASG ]; maintainers = [ maintainers.AluisioASG ];
platforms = platforms.all;
}; };
} }