Merge pull request #92163 from doronbehar/vokoscreen-ffmpeg4

vokoscreen: use latest ffmpeg
This commit is contained in:
Lassulus
2020-08-20 23:06:57 +02:00
committed by GitHub
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, mkDerivation { stdenv, fetchFromGitHub, mkDerivation
, pkgconfig, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr , pkgconfig, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr
, ffmpeg_3 , ffmpeg
}: }:
mkDerivation rec { mkDerivation rec {
@@ -35,7 +35,7 @@ mkDerivation rec {
''; '';
postConfigure = '' postConfigure = ''
substituteInPlace settings/QvkSettings.cpp --subst-var-by ffmpeg ${ffmpeg_3} substituteInPlace settings/QvkSettings.cpp --subst-var-by ffmpeg ${ffmpeg}
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {