qstopmotion: use ffmpeg instead of ffmpeg_3 (#123477)
FFmpeg isn't linked against, but the executable is used for rendering.
This commit is contained in:
parent
efee454783
commit
89a3768f04
|
@ -6,7 +6,7 @@
|
||||||
, qtquickcontrols
|
, qtquickcontrols
|
||||||
, qtimageformats
|
, qtimageformats
|
||||||
, qtxmlpatterns
|
, qtxmlpatterns
|
||||||
, ffmpeg_3
|
, ffmpeg
|
||||||
, guvcview
|
, guvcview
|
||||||
, cmake
|
, cmake
|
||||||
, ninja
|
, ninja
|
||||||
|
@ -40,7 +40,6 @@ mkDerivation rec {
|
||||||
v4l-utils
|
v4l-utils
|
||||||
libv4l
|
libv4l
|
||||||
pcre
|
pcre
|
||||||
ffmpeg_3
|
|
||||||
guvcview
|
guvcview
|
||||||
qwt
|
qwt
|
||||||
];
|
];
|
||||||
|
@ -64,6 +63,10 @@ mkDerivation rec {
|
||||||
grep -rl 'qwt' . | xargs sed -i 's@<qwt/qwt_slider.h>@<qwt_slider.h>@g'
|
grep -rl 'qwt' . | xargs sed -i 's@<qwt/qwt_slider.h>@<qwt_slider.h>@g'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
qtWrapperArgs = [
|
||||||
|
"--prefix" "PATH" ":" (lib.makeBinPath [ ffmpeg ])
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "http://www.qstopmotion.org";
|
homepage = "http://www.qstopmotion.org";
|
||||||
description = "Create stopmotion animation with a (web)camera";
|
description = "Create stopmotion animation with a (web)camera";
|
||||||
|
|
Loading…
Reference in a new issue