corrscope: Switch to regular ffmpeg
ffplay is now enabled in the regular one. If a full ffmpeg is desired, then it can just be overridden.
This commit is contained in:
parent
3f563e3b75
commit
5475817996
@ -2,7 +2,7 @@
|
|||||||
, lib
|
, lib
|
||||||
, python3Packages
|
, python3Packages
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, ffmpeg-full
|
, ffmpeg
|
||||||
, libsForQt5
|
, libsForQt5
|
||||||
, testers
|
, testers
|
||||||
, corrscope
|
, corrscope
|
||||||
@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
ffmpeg-full
|
ffmpeg
|
||||||
] ++ (with libsForQt5; [
|
] ++ (with libsForQt5; [
|
||||||
qtbase
|
qtbase
|
||||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [
|
] ++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||||
@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec {
|
|||||||
|
|
||||||
preFixup = ''
|
preFixup = ''
|
||||||
makeWrapperArgs+=(
|
makeWrapperArgs+=(
|
||||||
--prefix PATH : ${lib.makeBinPath [ ffmpeg-full ]}
|
--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
|
||||||
"''${qtWrapperArgs[@]}"
|
"''${qtWrapperArgs[@]}"
|
||||||
)
|
)
|
||||||
'';
|
'';
|
||||||
|
Loading…
Reference in New Issue
Block a user