treewide: use ffmpeg_3 explicitly if not wanted otherwise
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that used `ffmpeg` without requiring a specific version now use ffmpeg_3 explicitly so they shouldn't change.
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
, ffmpeg
|
||||
, ffmpeg_3
|
||||
, future
|
||||
, pytest
|
||||
, pytestrunner
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
(
|
||||
substituteAll {
|
||||
src = ./ffmpeg-location.patch;
|
||||
inherit ffmpeg;
|
||||
ffmpeg = ffmpeg_3;
|
||||
}
|
||||
)
|
||||
];
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, isPy3k
|
||||
, ffmpeg, async-timeout }:
|
||||
, ffmpeg_3, async-timeout }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ha-ffmpeg";
|
||||
@@ -12,7 +12,7 @@ buildPythonPackage rec {
|
||||
sha256 = "230f2fa990c9caaff1c67c2227b64756062248083849651a9bec7d599e519a42";
|
||||
};
|
||||
|
||||
buildInputs = [ ffmpeg ];
|
||||
buildInputs = [ ffmpeg_3 ];
|
||||
|
||||
propagatedBuildInputs = [ async-timeout ];
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
, pytest
|
||||
, numpy
|
||||
, isPy3k
|
||||
, ffmpeg
|
||||
, ffmpeg_3
|
||||
, futures
|
||||
, enum34
|
||||
}:
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [
|
||||
imageio-ffmpeg ffmpeg
|
||||
imageio-ffmpeg ffmpeg_3
|
||||
];
|
||||
propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [
|
||||
futures
|
||||
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
doCheck = false;
|
||||
|
||||
buildInputs = [ html5lib ];
|
||||
propagatedBuildInputs = [ six beautifulsoup4 pkgs.ffmpeg pkgs.swftools pkgs.rtmpdump ];
|
||||
propagatedBuildInputs = [ six beautifulsoup4 pkgs.ffmpeg_3 pkgs.swftools pkgs.rtmpdump ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Discover presentations and/or create a movie consisting of slides and audio track from an infoq url";
|
||||
|
||||
@@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkgs.pkgconfig ];
|
||||
buildInputs = with pkgs; [ alsaLib ffmpeg libv4l sqlite libvpx ];
|
||||
buildInputs = with pkgs; [ alsaLib ffmpeg_3 libv4l sqlite libvpx ];
|
||||
propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
, pandas
|
||||
, tables
|
||||
, git
|
||||
, ffmpeg
|
||||
, ffmpeg_3
|
||||
, scikitimage
|
||||
, matplotlib
|
||||
, qdarkstyle
|
||||
@@ -55,7 +55,7 @@ buildPythonPackage rec {
|
||||
pandas
|
||||
tables
|
||||
git
|
||||
ffmpeg
|
||||
ffmpeg_3
|
||||
scikitimage
|
||||
matplotlib
|
||||
qdarkstyle
|
||||
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
gifsicle = "${pkgs.gifsicle}/bin/gifsicle";
|
||||
exiftool = "${pkgs.exiftool}/bin/exiftool";
|
||||
jpegtran = "${pkgs.libjpeg}/bin/jpegtran";
|
||||
ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg";
|
||||
ffmpeg = "${pkgs.ffmpeg_3}/bin/ffmpeg";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user