Skip to content

Commit

Permalink
python3Packages.ffmpeg-python: replace ffmpeg_3 with ffmpeg
Browse files Browse the repository at this point in the history
See NixOS#120705 for the rationale.
ffmpeg-python doesn't seem to be strongly bound to any ffmpeg version
so we can just migrate away.
  • Loading branch information
AluisioASG committed Apr 26, 2021
1 parent 8e4fe32 commit 748e20c
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions pkgs/development/python-modules/ffmpeg-python/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
, buildPythonPackage
, fetchFromGitHub
, substituteAll
, ffmpeg_3
, pytestCheckHook
, ffmpeg
, future
, pytest
, pytestrunner
, pytest-mock
}:
Expand All @@ -21,23 +21,20 @@ buildPythonPackage rec {
};

patches = [
(
substituteAll {
src = ./ffmpeg-location.patch;
ffmpeg = ffmpeg_3;
}
)
(substituteAll {
src = ./ffmpeg-location.patch;
inherit ffmpeg;
})
];

buildInputs = [ pytestrunner ];
propagatedBuildInputs = [ future ];
checkInputs = [ pytest pytest-mock ];
checkInputs = [ pytestCheckHook pytest-mock ];

meta = with lib; {
description = "Python bindings for FFmpeg - with complex filtering support";
homepage = "https://github.com/kkroening/ffmpeg-python";
license = licenses.asl20;
maintainers = [ maintainers.AluisioASG ];
platforms = platforms.all;
};
}

0 comments on commit 748e20c

Please sign in to comment.