diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-17 08:40:33 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-17 08:40:33 +0200 |
| commit | 88508155778ae4a6626dec055a142040755e417d (patch) | |
| tree | 00cf20955150d0ec6f34eb0eb9cdbe897143dfc0 /pkgs/development/python-modules/av | |
| parent | c610d821670baed526474f2a1f87b870665cc104 (diff) | |
| parent | 0b671216bb3a170ba720b34c2640574999849d2e (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/python-modules/av')
| -rw-r--r-- | pkgs/development/python-modules/av/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 3a2fcc04d0461..594ac42018b27 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy27 , numpy -, ffmpeg_4 +, ffmpeg , pkgconfig }: @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ numpy ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ffmpeg_4 ]; + buildInputs = [ ffmpeg ]; # Tests require downloading files from internet doCheck = false; |